From: Marko Tiikkaja <marko@joh.to>
Date: Sun, 14 Dec 2014 02:57:14 +0000 (+0100)
Subject: database/sql: Remove unnecessary call to maybeOpenNewConnections
X-Git-Tag: go1.5beta1~2523
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9371babdd842a50067ee4ab22eec1d002ef94eab;p=gostls13.git

database/sql: Remove unnecessary call to maybeOpenNewConnections

numCanOpen will never be larger than 0 in maybeOpenNewConnections() when this
code path is taken, so no new connections can ever be opened.

Change-Id: Id1302e8d9afb3a67be61b5e738fe07ef81d20fe0
Reviewed-on: https://go-review.googlesource.com/1550
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go
index 6e6f246aee..8db9c78571 100644
--- a/src/database/sql/sql.go
+++ b/src/database/sql/sql.go
@@ -644,7 +644,6 @@ func (db *DB) conn() (*driverConn, error) {
 		// connectionOpener doesn't block while waiting for the req to be read.
 		req := make(chan connRequest, 1)
 		db.connRequests = append(db.connRequests, req)
-		db.maybeOpenNewConnections()
 		db.mu.Unlock()
 		ret := <-req
 		return ret.conn, ret.err