From 409a5e7eb4cca107037fafa4a7eea92603edb83d Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sat, 22 Dec 2012 01:15:33 +0000 Subject: libgo: Update to revision 15193:6fdc1974457c of master library. From-SVN: r194692 --- libgo/go/database/sql/sql.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libgo/go/database/sql/sql.go') diff --git a/libgo/go/database/sql/sql.go b/libgo/go/database/sql/sql.go index b0cba94..e7c7780 100644 --- a/libgo/go/database/sql/sql.go +++ b/libgo/go/database/sql/sql.go @@ -266,7 +266,7 @@ func (db *DB) connIfFree(wanted driver.Conn) (conn driver.Conn, ok bool) { var putConnHook func(*DB, driver.Conn) // putConn adds a connection to the db's free pool. -// err is optionally the last error that occured on this connection. +// err is optionally the last error that occurred on this connection. func (db *DB) putConn(c driver.Conn, err error) { if err == driver.ErrBadConn { // Don't reuse bad connections. @@ -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, -- cgit v1.1