From: Julien Schmidt <google@julienschmidt.com>
Date: Fri, 24 Aug 2012 02:29:47 +0000 (-0700)
Subject: database/sql: stop reuse of bad connections
X-Git-Tag: go1.1rc2~2595
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=37b40dab51e31ed246e2cd40b827d26b93cf9003;p=gostls13.git

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
---

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)