From d0501f1da9c54a8053940feeb86e1644ffaae522 Mon Sep 17 00:00:00 2001 From: Daniel Theophanes Date: Tue, 13 Dec 2016 07:55:12 -0800 Subject: database/sql: do not store Tx options in Context Drivers which previously supported tip will need to update to this revision before release. Fixes #18284 Change-Id: I70b8e7afff1558a8b5348885ce9f50e067c72ee9 Reviewed-on: https://go-review.googlesource.com/34330 Run-TryBot: Daniel Theophanes Reviewed-by: Brad Fitzpatrick TryBot-Result: Gobot Gobot --- src/database/sql/sql_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/database/sql/sql_test.go') diff --git a/src/database/sql/sql_test.go b/src/database/sql/sql_test.go index 1ec6217858..422d2198ba 100644 --- a/src/database/sql/sql_test.go +++ b/src/database/sql/sql_test.go @@ -375,7 +375,7 @@ func TestTxContextWait(t *testing.T) { ctx, _ := context.WithTimeout(context.Background(), time.Millisecond*15) - tx, err := db.BeginContext(ctx) + tx, err := db.BeginTx(ctx, nil) if err != nil { t.Fatal(err) } -- cgit v1.3