Skip to content

Commit a91e2c1

Browse files
committed
return first err in mysqlConn.Close
1 parent d76bca2 commit a91e2c1

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

connection.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,12 @@ func (mc *mysqlConn) Begin() (driver.Tx, error) {
113113
func (mc *mysqlConn) Close() (err error) {
114114
// Makes Close idempotent
115115
if mc.netConn != nil {
116-
mc.writeCommandPacket(comQuit)
117-
mc.netConn.Close()
116+
err = mc.writeCommandPacket(comQuit)
117+
if err == nil {
118+
err = mc.netConn.Close()
119+
} else {
120+
mc.netConn.Close()
121+
}
118122
mc.netConn = nil
119123
}
120124

0 commit comments

Comments
 (0)