summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorGeorgi Kodinov <kgeorge@mysql.com>2008-08-28 18:15:54 +0300
committerGeorgi Kodinov <kgeorge@mysql.com>2008-08-28 18:15:54 +0300
commitcac06c5ea7ed8b51d633690102709d1e46349139 (patch)
treef1c612f4b96e34e97d7678bf03124ae0159021f5 /mysql-test/include
parent05185ddc6e1881b5ccc221a0c9aef21d50dd9428 (diff)
downloadmariadb-git-cac06c5ea7ed8b51d633690102709d1e46349139.tar.gz
On behalf of Jasonh: fix for a failing test case of bug 37051
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/wait_for_slave_sql_error_and_skip.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/include/wait_for_slave_sql_error_and_skip.inc b/mysql-test/include/wait_for_slave_sql_error_and_skip.inc
index ef17ffed12f..4b4776d2923 100644
--- a/mysql-test/include/wait_for_slave_sql_error_and_skip.inc
+++ b/mysql-test/include/wait_for_slave_sql_error_and_skip.inc
@@ -17,6 +17,9 @@ if ($show_sql_error)
echo Last_SQL_Error = $error;
}
+# wait for SQL thread to stop after the error
+source include/wait_for_slave_sql_to_stop.inc;
+
# skip the erroneous statement
set global sql_slave_skip_counter=1;
start slave;