diff options
author | Naman Gera <namangera15@gmail.com> | 2021-04-09 03:48:14 +0000 |
---|---|---|
committer | Emmanuel Odeke <emmanuel@orijtech.com> | 2021-04-10 01:46:41 +0000 |
commit | 52bf14e0e8bdcd73f1ddfb0c4a1d0200097d3ba2 (patch) | |
tree | f74b0bff8523fa36dc932fd8b74450cabdd8aec9 /src/database | |
parent | 554d2c4f060ec42e30970dacff1e782250169323 (diff) | |
download | go-52bf14e0e8bdcd73f1ddfb0c4a1d0200097d3ba2.tar.gz go-52bf14e0e8bdcd73f1ddfb0c4a1d0200097d3ba2.zip |
all: fix spellings
This follows the spelling choices that the Go project has made for English words.
https://github.com/golang/go/wiki/Spelling
Change-Id: Ie7c586d2cf23020cb492cfff58c0831d2d8d3a78
GitHub-Last-Rev: e16a32cd225a275f73d236bcb33703986d110ded
GitHub-Pull-Request: golang/go#45442
Reviewed-on: https://go-review.googlesource.com/c/go/+/308291
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Trust: Emmanuel Odeke <emmanuel@orijtech.com>
Diffstat (limited to 'src/database')
-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() |