summaryrefslogtreecommitdiff
path: root/mysql-test/include/wait_for_slave_io_to_start.inc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-07-02 22:08:51 +0200
committerSergei Golubchik <sergii@pisem.net>2011-07-02 22:08:51 +0200
commit9809f05199aeb0b67991fac41bd86f38730768dc (patch)
treefa2792ff86d0da014b535d743759810612338042 /mysql-test/include/wait_for_slave_io_to_start.inc
parent0accbd0364e0333e0b119aa9ce93e34ded9df6cb (diff)
parent5a0e7394a5ae0c7b6a1ea35b7ea3a8985325987a (diff)
downloadmariadb-git-9809f05199aeb0b67991fac41bd86f38730768dc.tar.gz
5.5-merge
Diffstat (limited to 'mysql-test/include/wait_for_slave_io_to_start.inc')
-rw-r--r--mysql-test/include/wait_for_slave_io_to_start.inc39
1 files changed, 33 insertions, 6 deletions
diff --git a/mysql-test/include/wait_for_slave_io_to_start.inc b/mysql-test/include/wait_for_slave_io_to_start.inc
index abdc8339290..cd8e5d374a4 100644
--- a/mysql-test/include/wait_for_slave_io_to_start.inc
+++ b/mysql-test/include/wait_for_slave_io_to_start.inc
@@ -4,16 +4,43 @@
# connected to the master (i.e., until SHOW SLAVE STATUS returns Yes
# in the Slave_IO_Running field), or until a timeout is reached.
#
+#
# ==== Usage ====
#
-# source include/wait_for_slave_io_to_start.inc;
+# [--let $slave_timeout= NUMBER]
+# [--let $rpl_debug= 1]
+# [--let $rpl_allow_error= 1]
+# --source include/wait_for_slave_io_to_start.inc
+#
+# Parameters:
+# $slave_timeout
+# See include/wait_for_slave_param.inc
#
-# Parameters to this macro are $slave_timeout and
-# $master_connection. See wait_for_slave_param.inc for
-# descriptions.
+# $rpl_allow_error
+# By default, this file fails if there is an error in the IO
+# thread. However, the IO thread can recover and reconnect after
+# certain errors. If such an error is expected, can set
+# $rpl_allow_error=1. This will prevent this file from failing if
+# there is an error in the IO thread.
+#
+# $rpl_debug
+# See include/rpl_init.inc
+
+
+--let $include_filename= wait_for_slave_io_to_start.inc
+--source include/begin_include_file.inc
+
let $slave_param= Slave_IO_Running;
let $slave_param_value= Yes;
-let $slave_error_message= Failed while waiting for slave IO thread to start;
+if (!$rpl_allow_error)
+{
+ --let $slave_error_param= Last_IO_Errno
+}
source include/wait_for_slave_param.inc;
-let $slave_error_message= ;
+--let $slave_error_param=
+--let $rpl_allow_error= 0
+
+
+--let $include_filename= wait_for_slave_io_to_start.inc
+--source include/end_include_file.inc