diff options
| author | Sven Sandberg <sven@mysql.com> | 2008-07-14 11:41:23 +0200 |
|---|---|---|
| committer | Sven Sandberg <sven@mysql.com> | 2008-07-14 11:41:23 +0200 |
| commit | 815ee42b3fd36837c0b8b8e26dcab519960673d8 (patch) | |
| tree | aeda4561144046e7e76bfa889cd69482b1bec2c5 /mysql-test | |
| parent | acf4b576d7436ff71153882515d24971633f7ca2 (diff) | |
| download | mariadb-git-815ee42b3fd36837c0b8b8e26dcab519960673d8.tar.gz | |
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.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/start_slave.inc | 21 | ||||
| -rw-r--r-- | mysql-test/include/stop_slave.inc | 21 |
2 files changed, 42 insertions, 0 deletions
diff --git a/mysql-test/include/start_slave.inc b/mysql-test/include/start_slave.inc new file mode 100644 index 00000000000..0a78c5d8026 --- /dev/null +++ b/mysql-test/include/start_slave.inc @@ -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; diff --git a/mysql-test/include/stop_slave.inc b/mysql-test/include/stop_slave.inc new file mode 100644 index 00000000000..e9c56034fb3 --- /dev/null +++ b/mysql-test/include/stop_slave.inc @@ -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; |