aboutsummaryrefslogtreecommitdiff
path: root/libgo/go/database/sql/driver
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2020-07-17 12:30:51 -0700
committerIan Lance Taylor <iant@golang.org>2020-07-17 14:28:28 -0700
commitd5dfd4793febee6526e9ca84e06b5e207e0fbcee (patch)
tree67ee8ec7e6ad1697dfa1546524756140af9c8664 /libgo/go/database/sql/driver
parentf1b6e46c417224887c2f21baa6d4c538a25fe9fb (diff)
downloadgcc-d5dfd4793febee6526e9ca84e06b5e207e0fbcee.tar.gz
gcc-d5dfd4793febee6526e9ca84e06b5e207e0fbcee.tar.bz2
gcc-d5dfd4793febee6526e9ca84e06b5e207e0fbcee.zip
libgo: update to Go 1.14.6 release
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/243317
Diffstat (limited to 'libgo/go/database/sql/driver')
-rw-r--r--libgo/go/database/sql/driver/driver.go9
1 files changed, 3 insertions, 6 deletions
diff --git a/libgo/go/database/sql/driver/driver.go b/libgo/go/database/sql/driver/driver.go
index 316e7cea375..a0ba7ecf694 100644
--- a/libgo/go/database/sql/driver/driver.go
+++ b/libgo/go/database/sql/driver/driver.go
@@ -255,12 +255,9 @@ type ConnBeginTx interface {
// SessionResetter may be implemented by Conn to allow drivers to reset the
// session state associated with the connection and to signal a bad connection.
type SessionResetter interface {
- // ResetSession is called while a connection is in the connection
- // pool. No queries will run on this connection until this method returns.
- //
- // If the connection is bad this should return driver.ErrBadConn to prevent
- // the connection from being returned to the connection pool. Any other
- // error will be discarded.
+ // ResetSession is called prior to executing a query on the connection
+ // if the connection has been used before. If the driver returns ErrBadConn
+ // the connection is discarded.
ResetSession(ctx context.Context) error
}