Commit c90a869c authored by Alfranio Correia's avatar Alfranio Correia

auto-merge 5.1-bugteam --> 5.1-bugteam (local)

parents c470d5e4 6736e520
...@@ -10,5 +10,4 @@ ...@@ -10,5 +10,4 @@
# #
############################################################################## ##############################################################################
rpl_binlog_corruption : BUG#41793 2008-12-30 sven rpl_binlog_corruption disabled in main (needs new mtr)
rpl_cross_version : BUG#42311 2009-03-27 joro rpl_cross_version fails on macosx rpl_cross_version : BUG#42311 2009-03-27 joro rpl_cross_version fails on macosx
...@@ -34,6 +34,7 @@ source include/setup_fake_relay_log.inc; ...@@ -34,6 +34,7 @@ source include/setup_fake_relay_log.inc;
--echo ==== Test ==== --echo ==== Test ====
START SLAVE SQL_THREAD; START SLAVE SQL_THREAD;
let $slave_sql_errno= 1594; # ER_SLAVE_RELAY_LOG_READ_FAILURE
source include/wait_for_slave_sql_error.inc; source include/wait_for_slave_sql_error.inc;
let $error= query_get_value(SHOW SLAVE STATUS, Last_SQL_Error, 1); let $error= query_get_value(SHOW SLAVE STATUS, Last_SQL_Error, 1);
--echo Last_SQL_Error = $error --echo Last_SQL_Error = $error
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment