From 7102f123cf78fffee0291fb56058f613feda7af0 Mon Sep 17 00:00:00 2001 From: Julien Schmidt Date: Sat, 22 Sep 2012 05:54:47 +1000 Subject: [PATCH] [release-branch.go1] database/sql: stop reuse of bad connections MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ««« backport b397807815a6 database/sql: stop reuse of bad connections The second parameter for sql.putConn() (err) is always nil. As a result bad connections are reused, even if the driver returns an driver.ErrBadConn. Unsing a pointer to err instead achievs the desired behavior. See http://code.google.com/p/go/issues/detail?id=3777 for more details. Fixes #3777. R=golang-dev, dave, bradfitz, jameshuachow, BlakeSGentry CC=golang-dev https://golang.org/cl/6348069 »»» --- src/pkg/database/sql/sql.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) mode change 100644 => 100755 src/pkg/database/sql/sql.go diff --git a/src/pkg/database/sql/sql.go b/src/pkg/database/sql/sql.go old mode 100644 new mode 100755 index 89136ef6e4..d557fc8303 --- a/src/pkg/database/sql/sql.go +++ b/src/pkg/database/sql/sql.go @@ -311,7 +311,10 @@ func (db *DB) prepare(query string) (stmt *Stmt, err error) { if err != nil { return nil, err } - defer db.putConn(ci, err) + defer func() { + db.putConn(ci, err) + }() + si, err := ci.Prepare(query) if err != nil { return nil, err @@ -345,7 +348,9 @@ func (db *DB) exec(query string, sargs []driver.Value) (res Result, err error) { if err != nil { return nil, err } - defer db.putConn(ci, err) + defer func() { + db.putConn(ci, err) + }() if execer, ok := ci.(driver.Execer); ok { resi, err := execer.Exec(query, sargs) -- 2.50.0