diff options
author | Kristofer Pettersson <kristofer.pettersson@sun.com> | 2009-03-06 11:49:39 +0100 |
---|---|---|
committer | Kristofer Pettersson <kristofer.pettersson@sun.com> | 2009-03-06 11:49:39 +0100 |
commit | 55c779cdbf0e402338bb32253a2fc1db7fa02129 (patch) | |
tree | a2136f93bb28c0e655cf133c9245ead5bf039ae9 /mysql-test/include/start_slave.inc | |
parent | ac821c65701d38ced2d3167cf9c54559599d4f52 (diff) | |
parent | b4fdb8aec14b533db4a5ea2f99c1a9f3ce07946c (diff) | |
download | mariadb-git-55c779cdbf0e402338bb32253a2fc1db7fa02129.tar.gz |
Manual merge
Diffstat (limited to 'mysql-test/include/start_slave.inc')
-rw-r--r-- | mysql-test/include/start_slave.inc | 21 |
1 files changed, 21 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..78a02736de8 --- /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 +# $master_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; |