fix issue 1361

AUTHORS

@@ -13,6 +13,7 @@
 
 Aaron Hopkins <go-sql-driver at die.net>
 Achille Roussel <achille.roussel at gmail.com>
+Aidan <aidan.liu at pingcap.com>
 Alex Snast <alexsn at fb.com>
 Alexey Palazhchenko <alexey.palazhchenko at gmail.com>
 Andrew Reid <andrew.reid at tixtrack.com>

driver_test.go

@@ -3406,3 +3406,58 @@ func TestConnectionAttributes(t *testing.T) {
 	}
 	rows.Close()
 }
+
+func TestIssue1361(t *testing.T) {
+	var db *sql.DB
+	if _, err := ParseDSN(dsn); err != errInvalidDSNUnsafeCollation {
+		db, err = sql.Open("mysql", dsn)
+		if err != nil {
+			t.Fatalf("error connecting: %s", err.Error())
+		}
+		defer db.Close()
+	}
+
+	dbt := &DBTest{t, db}
+	queries := []string{
+		`
+        CREATE PROCEDURE test_proc1()
+        BEGIN
+            SIGNAL SQLSTATE '10000' SET MESSAGE_TEXT = "some error",  MYSQL_ERRNO = 10000;
+        END;
+	`,
+		`
+        CREATE PROCEDURE test_proc2()
+        BEGIN
+            SELECT 1,2;
+            SELECT 3,4;
+            SIGNAL SQLSTATE '10000' SET MESSAGE_TEXT = "some error",  MYSQL_ERRNO = 10000;
+        END;
+	`,
+	}
+	names := []string{
+		"test_proc1", "test_proc2",
+	}
+	for i, query := range queries {
+		runCallCommand(dbt, query, names[i])
+	}
+
+}
+
+func runCallCommand(dbt *DBTest, query, name string) {
+
+	dbt.mustExec(fmt.Sprintf("DROP PROCEDURE IF EXISTS %s;", name))
+	dbt.mustExec(query)
+	defer dbt.mustExec("drop procedure " + name)
+	rows, err := dbt.db.Query(fmt.Sprintf("call %s;", name))
+	if err != nil {
+		return
+	}
+	defer rows.Close()
+
+	for rows.Next() {
+	}
+	for rows.NextResultSet() { // original thread will be blocked when exec rs.Close()
+		for rows.Next() {
+		}
+	}
+}

rows.go

@@ -163,7 +163,13 @@ func (rows *mysqlRows) nextResultSet() (int, error) {
 	rows.rs = resultSet{}
 	// rows.mc.affectedRows and rows.mc.insertIds accumulate on each call to
 	// nextResultSet.
-	return rows.mc.resultUnchanged().readResultSetHeaderPacket()
+	resLen, err := rows.mc.resultUnchanged().readResultSetHeaderPacket()
+	if err != nil {
+		// Clean up about multi-results flag
+		rows.rs.done = true
+		rows.mc.status = rows.mc.status & (^statusMoreResultsExists)
+	}
+	return resLen, err
 }
 
 func (rows *mysqlRows) nextNotEmptyResultSet() (int, error) {