mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
BUG#37975: wait_for_slave_* should increase the timeout
Post-push fixes: I forgot to include the new files start_slave.inc and stop_slave.inc in the previuos push. mysql-test/include/start_slave.inc: Added file. Purpose: start slave synchronously, waiting for the two threads to start. mysql-test/include/stop_slave.inc: Added file. Purpose: stop slave synchronously, waiting for the two threads to stop.
This commit is contained in:
parent
acf4b576d7
commit
815ee42b3f
2 changed files with 42 additions and 0 deletions
21
mysql-test/include/start_slave.inc
Normal file
21
mysql-test/include/start_slave.inc
Normal file
|
@ -0,0 +1,21 @@
|
|||
# ==== Purpose ====
|
||||
#
|
||||
# Issues START SLAVE on the current connection. Then waits until both
|
||||
# the IO and SQL threads have started, or until a timeout is reached.
|
||||
#
|
||||
# Please use this instead of 'START SLAVE', to reduce the risk of test
|
||||
# case bugs.
|
||||
#
|
||||
# ==== Usage ====
|
||||
#
|
||||
# source include/wait_for_slave_to_start.inc;
|
||||
#
|
||||
# Parameters to this macro are $slave_timeout and
|
||||
# $slave_keep_connection. See wait_for_slave_param.inc for
|
||||
# descriptions.
|
||||
|
||||
--disable_query_log
|
||||
START SLAVE;
|
||||
--enable_query_log
|
||||
--echo include/start_slave.inc
|
||||
source include/wait_for_slave_to_start.inc;
|
21
mysql-test/include/stop_slave.inc
Normal file
21
mysql-test/include/stop_slave.inc
Normal file
|
@ -0,0 +1,21 @@
|
|||
# ==== Purpose ====
|
||||
#
|
||||
# Issues STOP SLAVE on the current connection. Then waits until both
|
||||
# the IO and SQL threads have stopped, or until a timeout is reached.
|
||||
#
|
||||
# Please use this instead of 'STOP SLAVE', to reduce the risk of test
|
||||
# case bugs.
|
||||
#
|
||||
# ==== Usage ====
|
||||
#
|
||||
# source include/wait_for_slave_to_start.inc;
|
||||
#
|
||||
# Parameters to this macro are $slave_timeout and
|
||||
# $slave_keep_connection. See wait_for_slave_param.inc for
|
||||
# descriptions.
|
||||
|
||||
--disable_query_log
|
||||
STOP SLAVE;
|
||||
--enable_query_log
|
||||
--echo include/stop_slave.inc
|
||||
source include/wait_for_slave_to_stop.inc;
|
Loading…
Reference in a new issue