diff options
| author | Luis Soares <luis.soares@sun.com> | 2009-09-30 17:42:25 +0100 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2009-09-30 17:42:25 +0100 |
| commit | 8f43e00841d141ceae42ff9e83a9f5f4eeb298e3 (patch) | |
| tree | acd03911cfa50f6ea5831bd439d21032b6dc47ef /mysql-test | |
| parent | 0ebecf7f0af131dfe0c046ffddc55e3767bea33a (diff) | |
| download | mariadb-git-8f43e00841d141ceae42ff9e83a9f5f4eeb298e3.tar.gz | |
BUG#47749: rpl_slave_skip fails sporadically on PB2 (mysql-5.1-rep+2 tree).
rpl_slave_skip fails randomly on PB2. This patch fixes the failure by
setting explicit wait for SQL thread to stop, instead of the
wait_for_slave_to_stop mysqltest command, after a start until command
is executed.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_slave_skip.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_slave_skip.test b/mysql-test/suite/rpl/t/rpl_slave_skip.test index f4cb0f69e93..6336e775af1 100644 --- a/mysql-test/suite/rpl/t/rpl_slave_skip.test +++ b/mysql-test/suite/rpl/t/rpl_slave_skip.test @@ -27,7 +27,7 @@ connection slave; # Stop when reaching the the first table map event. START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=762; -wait_for_slave_to_stop; +-- source include/wait_for_slave_sql_to_stop.inc --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 # 8 # 9 # 23 # 33 # 35 # 36 # query_vertical SHOW SLAVE STATUS; @@ -59,7 +59,7 @@ source include/show_binlog_events.inc; connection slave; START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=106; -wait_for_slave_to_stop; +-- source include/wait_for_slave_sql_to_stop.inc SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; START SLAVE; sync_with_master; |