diff --git a/go.mod b/go.mod index c95aec6ae69..c8e531d8ec9 100644 --- a/go.mod +++ b/go.mod @@ -53,8 +53,6 @@ require ( github.com/mattn/go-runewidth v0.0.1 // indirect github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1 github.com/mitchellh/go-testing-interface v1.0.0 // indirect - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.1 // indirect github.com/olekukonko/tablewriter v0.0.0-20160115111002-cca8bbc07984 github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02 github.com/opentracing/opentracing-go v1.1.0 diff --git a/go/vt/binlog/binlogplayer/dbclient.go b/go/vt/binlog/binlogplayer/dbclient.go index 83533ddb34a..abaf3506c93 100644 --- a/go/vt/binlog/binlogplayer/dbclient.go +++ b/go/vt/binlog/binlogplayer/dbclient.go @@ -102,10 +102,7 @@ func (dc *dbClientImpl) Rollback() error { } func (dc *dbClientImpl) Close() { - if dc.dbConn != nil { - dc.dbConn.Close() - dc.dbConn = nil - } + dc.dbConn.Close() } func (dc *dbClientImpl) ExecuteFetch(query string, maxrows int) (*sqltypes.Result, error) { diff --git a/go/vt/vttablet/tabletmanager/vreplication/framework_test.go b/go/vt/vttablet/tabletmanager/vreplication/framework_test.go index 24853187a62..08c2b40465e 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/framework_test.go +++ b/go/vt/vttablet/tabletmanager/vreplication/framework_test.go @@ -368,7 +368,6 @@ func (dbc *realDBClient) Rollback() error { func (dbc *realDBClient) Close() { dbc.conn.Close() - dbc.conn = nil } func (dbc *realDBClient) ExecuteFetch(query string, maxrows int) (*sqltypes.Result, error) {