From 37b40dab51e31ed246e2cd40b827d26b93cf9003 Mon Sep 17 00:00:00 2001 From: Julien Schmidt Date: Thu, 23 Aug 2012 19:29:47 -0700 Subject: [PATCH] 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 b87f57f92f..b0cba949c6 --- 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 @@ -342,7 +345,9 @@ func (db *DB) exec(query string, args []interface{}) (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 { dargs, err := driverArgs(nil, args) -- 2.50.0