diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2010-03-01 14:33:15 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2010-03-01 14:33:15 +0200 |
| commit | 1f6874f1547e91682ef2cc9ba2280fd6621f6f60 (patch) | |
| tree | e80dfae1af6bfac37a3739114feffd80d4c683dd /mysql-test | |
| parent | 85faefd1ab9962f710dd04a6e32845dc72c3b55e (diff) | |
| download | mariadb-git-1f6874f1547e91682ef2cc9ba2280fd6621f6f60.tar.gz | |
Bug #51600 rpl_slave_skip waits for slave to stop incorrectly
START SLAVE UNTIL MASTER ... specifies only SQL thread to stop.
rpl_slave_skip erronously deployed waiting for stop of both threads.
Corrected with deploying the correct macro.
Notice, earlier a similar bug@47749 was fixed in mysql-trunk.
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..c5ee6793277 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; |