Commit a10744a4 authored by kent@mysql.com's avatar kent@mysql.com Committed by mysqldev
Browse files

Merge from mysql-5.1.28-rc-release

parents 09ea0a5b b905353b

mysql-test/include/wait_for_slave_sql_error_and_skip.inc

+3 −0
Original line number Diff line number Diff line
@@ -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;