From a293065a39963ef2efb4cc133e286d2d97b356a9 Mon Sep 17 00:00:00 2001
From: Alex Brainman <alex.brainman@gmail.com>
Date: Tue, 23 Jul 2013 14:09:53 +1000
Subject: database/sql: close statement before connection

Fixes #5936

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/11620046
---
 src/pkg/database/sql/sql.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/pkg/database/sql/sql.go')

diff --git a/src/pkg/database/sql/sql.go b/src/pkg/database/sql/sql.go
index ebb7f440e0..35d5338c56 100644
--- a/src/pkg/database/sql/sql.go
+++ b/src/pkg/database/sql/sql.go
@@ -759,10 +759,10 @@ func (db *DB) queryConn(dc *driverConn, releaseConn func(error), query string, a
 	ds := driverStmt{dc, si}
 	rowsi, err := rowsiFromStatement(ds, args...)
 	if err != nil {
-		releaseConn(err)
 		dc.Lock()
 		si.Close()
 		dc.Unlock()
+		releaseConn(err)
 		return nil, err
 	}
 
-- 
cgit v1.3