simplify test

Author: methane

driver_test.go

@@ -3407,7 +3407,8 @@ func TestConnectionAttributes(t *testing.T) {
 	rows.Close()
 }
 
-func TestIssue1361(t *testing.T) {
+func TestErrorInMultiResult(t *testing.T) {
+	// https://github.com/go-sql-driver/mysql/issues/1361
 	var db *sql.DB
 	if _, err := ParseDSN(dsn); err != errInvalidDSNUnsafeCollation {
 		db, err = sql.Open("mysql", dsn)
@@ -3418,45 +3419,30 @@ func TestIssue1361(t *testing.T) {
 	}
 
 	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])
-	}
-
+	query := `
+CREATE PROCEDURE test_proc1()
+BEGIN
+	SELECT 1,2;
+	SELECT 3,4;
+	SIGNAL SQLSTATE '10000' SET MESSAGE_TEXT = "some error",  MYSQL_ERRNO = 10000;
+END;
+`
+	runCallCommand(dbt, query, "test_proc1")
 }
 
 func runCallCommand(dbt *DBTest, query, name string) {
-
-	dbt.mustExec(fmt.Sprintf("DROP PROCEDURE IF EXISTS %s;", name))
+	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))
+	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.NextResultSet() {
 		for rows.Next() {
 		}
 	}