From: James David Chalfant <james.chalfant@gmail.com>
Date: Thu, 13 Dec 2012 06:04:55 +0000 (-0800)
Subject:     database/sql: Alter *DB.begin to return driver.ErrBadConn when driver.Conn.Begin... 
X-Git-Tag: go1.1rc2~1641
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=309eae19235349d39053f06887f0384c5757fa3e;p=gostls13.git

database/sql: Alter *DB.begin to return driver.ErrBadConn when driver.Conn.Begin returns driver.ErrBadConn
Fixes #4433

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/6845094
---

diff --git a/src/pkg/database/sql/sql.go b/src/pkg/database/sql/sql.go
index b0cba949c6..e59d0130d5 100644
--- a/src/pkg/database/sql/sql.go
+++ b/src/pkg/database/sql/sql.go
@@ -426,7 +426,7 @@ func (db *DB) begin() (tx *Tx, err error) {
 	txi, err := ci.Begin()
 	if err != nil {
 		db.putConn(ci, err)
-		return nil, fmt.Errorf("sql: failed to Begin transaction: %v", err)
+		return nil, err
 	}
 	return &Tx{
 		db:  db,