mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
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. mysql-test/suite/rpl/t/rpl_slave_skip.test: changing two waiting calls for offline of both threads into waiting for SQL to stop.
This commit is contained in:
parent
b7a63ac9e2
commit
dbb9e58c13
1 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue