diff options
Diffstat (limited to 'src/database/sql')
| -rw-r--r-- | src/database/sql/sql.go | 2 | ||||
| -rw-r--r-- | src/database/sql/sql_test.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go index 12cc524c63..61b5018f0b 100644 --- a/src/database/sql/sql.go +++ b/src/database/sql/sql.go @@ -1795,7 +1795,7 @@ func (db *DB) beginDC(ctx context.Context, dc *driverConn, release func(error), return nil, err } - // Schedule the transaction to rollback when the context is cancelled. + // Schedule the transaction to rollback when the context is canceled. // The cancel function in Tx will be called after done is set to true. ctx, cancel := context.WithCancel(ctx) tx = &Tx{ diff --git a/src/database/sql/sql_test.go b/src/database/sql/sql_test.go index c06e565ea9..94af39c207 100644 --- a/src/database/sql/sql_test.go +++ b/src/database/sql/sql_test.go @@ -656,7 +656,7 @@ func TestPoolExhaustOnCancel(t *testing.T) { db.SetMaxOpenConns(max) // First saturate the connection pool. - // Then start new requests for a connection that is cancelled after it is requested. + // Then start new requests for a connection that is canceled after it is requested. state = 1 for i := 0; i < max; i++ { @@ -2784,7 +2784,7 @@ func TestTxCannotCommitAfterRollback(t *testing.T) { // 3. Check if 2.A has committed in Tx (pass) or outside of Tx (fail). sendQuery := make(chan struct{}) // The Tx status is returned through the row results, ensure - // that the rows results are not cancelled. + // that the rows results are not canceled. bypassRowsAwaitDone = true hookTxGrabConn = func() { cancel() |