moved checking canceled logic into method of connection.

Author: shogo82148

connection.go

@@ -134,6 +134,16 @@ func (mc *mysqlConn) isBroken() bool {
 	return mc.closed
 }
 
+func (mc *mysqlConn) error() error {
+	if mc.isBroken() {
+		if err := mc.canceled(); err != nil {
+			return err
+		}
+		return ErrInvalidConn
+	}
+	return nil
+}
+
 func (mc *mysqlConn) Prepare(query string) (driver.Stmt, error) {
 	if mc.isBroken() {
 		errLog.Print(ErrInvalidConn)

rows.go

@@ -161,11 +161,8 @@ func (rows *binaryRows) NextResultSet() error {
 
 func (rows *binaryRows) Next(dest []driver.Value) error {
 	if mc := rows.mc; mc != nil {
-		if mc.isBroken() {
-			if err := mc.canceled(); err != nil {
-				return err
-			}
-			return ErrInvalidConn
+		if err := mc.error(); err != nil {
+			return err
 		}
 
 		// Fetch next row from stream
@@ -186,11 +183,8 @@ func (rows *textRows) NextResultSet() (err error) {
 
 func (rows *textRows) Next(dest []driver.Value) error {
 	if mc := rows.mc; mc != nil {
-		if mc.isBroken() {
-			if err := mc.canceled(); err != nil {
-				return err
-			}
-			return ErrInvalidConn
+		if err := mc.error(); err != nil {
+			return err
 		}
 
 		// Fetch next row from stream