Manual merge

1 files changed, 21 insertions, 23 deletions

diff --git a/mysql-test/include/wait_for_slave_io_error.inc b/mysql-test/include/wait_for_slave_io_error.inc
index c3ba9eeff8b..34cbf20a73b 100644
--- a/mysql-test/include/wait_for_slave_io_error.inc
+++ b/mysql-test/include/wait_for_slave_io_error.inc
@@ -6,14 +6,21 @@
 #
 # ==== Usage ====
 #
+# # Wait several errors.  
+# let $slave_io_errno= 1, 2, 3; 
+# source include/wait_for_slave_io_error.inc;
+#
+# # Print error message 
+# let $slave_io_errno= 1; 
+# let $show_slave_io_error= 1; 
 # source include/wait_for_slave_io_error.inc;
 #
 # Parameters:
 #
 # $slave_io_errno
-#   The expected IO error number.  This is required.
+#   The expected IO error numbers.  This is required.
 #   (After BUG#41956 has been fixed, this will be required to be a
-#   symbolic name instead of a number.)
+#   symbolic name instead of a numbers.)
 #
 # $show_slave_io_error
 #   If set, will print the error to the query log.
@@ -25,15 +32,9 @@
 #   See wait_for_slave_param.inc for description.
 
 if (`SELECT '$slave_io_errno' = ''`) {
-#  --die !!!ERROR IN TEST: you must set \$slave_io_errno before sourcing
-#  wait_for_slave_io_error.inc
+  --die !!!ERROR IN TEST: you must set \$slave_io_errno before sourcing wait_for_slave_io_error.inc
 }
 
-#let $slave_param= Slave_IO_Running;
-#let $slave_param_value= No;
-#let $slave_error_message= Failed while waiting for slave to stop the IO thread (expecting error in the IO thread);
-#source include/wait_for_slave_param.inc;
-
 let $old_slave_param_comparison= $slave_param_comparison;
 let $slave_param= Last_IO_Errno;
 let $slave_param_comparison= !=;
@@ -43,19 +44,16 @@ source include/wait_for_slave_param.inc;
 let $slave_error_message= ;
 let $slave_param_comparison= $old_slave_param_comparison;
 
-if ($slave_io_errno)
-{
-  let $_error= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1);
-  if (`SELECT '$_error' != '$slave_io_errno'`) {
-    --echo **** Slave stopped with wrong error code: $_error (expected $slave_io_errno) ****
-      source include/show_rpl_debug_info.inc;
-    --echo **** Slave stopped with wrong error code: $_error (expected $slave_io_errno) ****
-      --die Slave stopped with wrong error code
-  }
+let $_error= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1);
+if (`SELECT $_error NOT IN ($slave_io_errno)`) {
+  --echo **** Slave stopped with wrong error code: $_error (expected $slave_io_errno) ****
+  source include/show_rpl_debug_info.inc;
+  --echo **** Slave stopped with wrong error code: $_error (expected $slave_io_errno) ****
+  --die Slave stopped with wrong error code
+}
 
-  if ($show_slave_io_error)
-  {
-    let $error= query_get_value("SHOW SLAVE STATUS", Last_IO_Error, 1);
-    echo Last_IO_Error = $error;
-  }
+if ($show_slave_io_error)
+{
+  let $error= query_get_value("SHOW SLAVE STATUS", Last_IO_Error, 1);
+  echo Last_IO_Error = $error;
 }