set rows.finish directly.

connection.go

@@ -354,6 +354,10 @@ func (mc *mysqlConn) exec(query string) error {
 }
 
 func (mc *mysqlConn) Query(query string, args []driver.Value) (driver.Rows, error) {
+	return mc.query(query, args)
+}
+
+func (mc *mysqlConn) query(query string, args []driver.Value) (*textRows, error) {
 	if mc.isBroken() {
 		errLog.Print(ErrInvalidConn)
 		return nil, driver.ErrBadConn

connection_go18.go

@@ -17,10 +17,6 @@ import (
 	"errors"
 )
 
-type setfinish interface {
-	setFinish(f func())
-}
-
 // Ping implements driver.Pinger interface
 func (mc *mysqlConn) Ping(ctx context.Context) error {
 	if mc.isBroken() {
@@ -81,16 +77,12 @@ func (mc *mysqlConn) QueryContext(ctx context.Context, query string, args []driv
 		return nil, err
 	}
 
-	rows, err := mc.Query(query, dargs)
+	rows, err := mc.query(query, dargs)
 	if err != nil {
 		mc.finish()
 		return nil, err
 	}
-	if set, ok := rows.(setfinish); ok {
-		set.setFinish(mc.finish)
-	} else {
-		mc.finish()
-	}
+	rows.finish = mc.finish
 	return rows, err
 }
 
@@ -138,16 +130,12 @@ func (stmt *mysqlStmt) QueryContext(ctx context.Context, args []driver.NamedValu
 		return nil, err
 	}
 
-	rows, err := stmt.Query(dargs)
+	rows, err := stmt.query(dargs)
 	if err != nil {
 		stmt.mc.finish()
 		return nil, err
 	}
-	if set, ok := rows.(setfinish); ok {
-		set.setFinish(stmt.mc.finish)
-	} else {
-		stmt.mc.finish()
-	}
+	rows.finish = stmt.mc.finish
 	return rows, err
 }
 

rows.go

@@ -65,10 +65,6 @@ func (rows *mysqlRows) Columns() []string {
 	return columns
 }
 
-func (rows *mysqlRows) setFinish(f func()) {
-	rows.finish = f
-}
-
 func (rows *mysqlRows) Close() (err error) {
 	if f := rows.finish; f != nil {
 		f()

statement.go

@@ -89,6 +89,10 @@ func (stmt *mysqlStmt) Exec(args []driver.Value) (driver.Result, error) {
 }
 
 func (stmt *mysqlStmt) Query(args []driver.Value) (driver.Rows, error) {
+	return stmt.query(args)
+}
+
+func (stmt *mysqlStmt) query(args []driver.Value) (*binaryRows, error) {
 	if stmt.mc.isBroken() {
 		errLog.Print(ErrInvalidConn)
 		return nil, driver.ErrBadConn