2724 Georgi Kodinov 2008-08-28 [merge]
merge
modified:
mysql-test/t/partition_not_windows.test
=== modified file 'mysql-test/include/wait_for_slave_sql_error_and_skip.inc'
--- a/mysql-test/include/wait_for_slave_sql_error_and_skip.inc 2008-08-26 12:11:56 +0000
+++ b/mysql-test/include/wait_for_slave_sql_error_and_skip.inc 2008-08-28 15:15:54 +0000
@@ -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;
| Thread |
|---|
| • bzr push into mysql-5.1 branch (kgeorge:2724) | Georgi Kodinov | 28 Aug |