binaryRows: both EOF and MySQLErrors set rows.mc = nil, not just EOF

Author: encryptio

rows.go

@@ -59,18 +59,31 @@ func (rows *mysqlRows) Close() error {
 }
 
 func (rows *binaryRows) Next(dest []driver.Value) error {
-	if mc := rows.mc; mc != nil {
-		if mc.netConn == nil {
-			return ErrInvalidConn
-		}
+	if rows.mc == nil {
+		return io.EOF
+	}
 
-		// Fetch next row from stream
-		if err := rows.readRow(dest); err != io.EOF {
-			return err
+	mc := rows.mc
+	if mc.netConn == nil {
+		return ErrInvalidConn
+	}
+
+	// Fetch next row from stream
+	err := rows.readRow(dest)
+	done := false
+	if err != nil {
+		if err == io.EOF {
+			done = true
+		}
+		if _, ok := err.(*MySQLError); ok {
+			done = true
 		}
+	}
+	if done {
 		rows.mc = nil
 	}
-	return io.EOF
+
+	return err
 }
 
 func (rows *textRows) Next(dest []driver.Value) error {