From: Russ Cox <rsc@golang.org>
Date: Wed, 15 Nov 2017 20:14:07 +0000 (-0500)
Subject: database/sql: fix ctx.Done() == nil check
X-Git-Tag: go1.10beta1~252
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b9dca1b165fad8d8ad8fcd47cfa7bf0d5ae60c63;p=gostls13.git

database/sql: fix ctx.Done() == nil check

ctx.Done() == ctx.Background().Done() is just
a long way to write ctx.Done() == nil.
Use the short way.

Change-Id: I7b3198b5dc46b8b40086243aa61882bc8c268eac
Reviewed-on: https://go-review.googlesource.com/78128
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/database/sql/ctxutil.go b/src/database/sql/ctxutil.go
index 170ec7d8a0..af2afd5aa5 100644
--- a/src/database/sql/ctxutil.go
+++ b/src/database/sql/ctxutil.go
@@ -120,7 +120,7 @@ func ctxDriverBegin(ctx context.Context, opts *TxOptions, ci driver.Conn) (drive
 		}
 	}
 
-	if ctx.Done() == context.Background().Done() {
+	if ctx.Done() == nil {
 		return ci.Begin()
 	}