From: Li-Bing.Song
Date: May 28 2010 3:09am
Subject: bzr commit into mysql-5.1-bugteam branch (Li-Bing.Song:3400) Bug#49741
List-Archive: http://lists.mysql.com/commits/109441
X-Bug: 49741
Message-Id: <201005280311.o4S3BLLc019095@anders-server>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0175261989685883620=="

--===============0175261989685883620==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/anders/work/bzrwork1/wt1/mysql-5.1-bugteam/ based on revid:dlenev@stripped

 3400 Li-Bing.Song@stripped	2010-05-28
      Postfix for BUG#49741
      Add code to waiting for a set of errors.
      Add code to waiting for an error instead of waiting for io thread to stop, as
      after 'START SLAVE', the status of io thread is still not running.
      But it doesn't mean slave io thread encounters an error.

    modified:
      mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
      mysql-test/include/wait_for_slave_io_error.inc
      mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
=== modified file 'mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test'
--- a/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test	2010-05-24 13:54:08 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test	2010-05-28 02:57:45 +0000
@@ -68,19 +68,15 @@ eval SET DEBUG_SYNC=$debug_sync_action;
 
 # Show slave last IO errno
 connection slave;
-source include/wait_for_slave_io_to_stop.inc;
-let $last_io_errno= query_get_value("show slave status", Last_IO_Errno, 1);
 --echo Check network error happened here
-if (`SELECT '$last_io_errno' = '2013' || # CR_SERVER_LOST
-            '$last_io_errno' = '2003' || # CR_CONN_HOST_ERROR
-            '$last_io_errno' = '2002' || # CR_CONNECTION_ERROR
-            '$last_io_errno' = '2006' || # CR_SERVER_GONE_ERROR
-            '$last_io_errno' = '1040' || # ER_CON_COUNT_ERROR
-            '$last_io_errno' = '1053'    # ER_SERVER_SHUTDOWN
-            `)
-{
-  --echo NETWORK ERROR
-}
+# '2013' CR_SERVER_LOST 
+# '2003' CR_CONN_HOST_ERROR 
+# '2002' CR_CONNECTION_ERROR 
+# '2006' CR_SERVER_GONE_ERROR 
+# '1040' ER_CON_COUNT_ERROR 
+# '1053' ER_SERVER_SHUTDOWN
+let $slave_io_errno= 1040, 1053, 2002, 2003, 2006, 2013;
+source include/wait_for_slave_io_error.inc;
 
 # deactivate the sync point of get_master_version_and_clock()
 # now to avoid restarting IO-thread to re-enter it.

=== modified file 'mysql-test/include/wait_for_slave_io_error.inc'
--- a/mysql-test/include/wait_for_slave_io_error.inc	2010-05-24 13:54:08 +0000
+++ b/mysql-test/include/wait_for_slave_io_error.inc	2010-05-28 02:57:45 +0000
@@ -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.
@@ -28,13 +35,17 @@ if (`SELECT '$slave_io_errno' = ''`) {
   --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);
+let $old_slave_param_comparison= $slave_param_comparison;
+let $slave_param= Last_IO_Errno;
+let $slave_param_comparison= !=;
+let $slave_param_value= 0;
+let $slave_error_message= Failed while waiting for slave to produce an error in its sql thread;
 source include/wait_for_slave_param.inc;
+let $slave_error_message= ;
+let $slave_param_comparison= $old_slave_param_comparison;
 
 let $_error= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1);
-if (`SELECT '$_error' != '$slave_io_errno'`) {
+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) ****

=== modified file 'mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result'
--- a/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result	2010-05-24 13:54:08 +0000
+++ b/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result	2010-05-28 02:57:45 +0000
@@ -14,7 +14,6 @@ slave is going to hang in get_master_ver
 slave is unblocked
 SET DEBUG_SYNC='now SIGNAL signal.get_unix_timestamp';
 Check network error happened here
-NETWORK ERROR
 set @@global.debug = "-d,'debug_lock.before_get_UNIX_TIMESTAMP'";
 stop slave;
 SET @@global.debug= "+d,'debug_lock.before_get_SERVER_ID'";
@@ -23,7 +22,6 @@ slave is going to hang in get_master_ver
 slave is unblocked
 SET DEBUG_SYNC='now SIGNAL signal.get_server_id';
 Check network error happened here
-NETWORK ERROR
 set @@global.debug = "-d,'debug_lock.before_get_SERVER_ID'";
 set global debug= '';
 reset master;


--===============0175261989685883620==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/li-bing.song@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: li-bing.song@stripped
# target_branch: file:///home/anders/work/bzrwork1/wt1/mysql-5.1-\
#   bugteam/
# testament_sha1: 9cd1490164ebc936fefe5acdf6aabb717c5a48cc
# timestamp: 2010-05-28 11:10:00 +0800
# source_branch: file:///home/anders/work/bzrroot1/mysql-5.1-bugteam/
# base_revision_id: dlenev@stripped
# 
# Begin bundle
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
xdyRThQkO35YcIA=


--===============0175261989685883620==--