bzr commit into mysql-5.5 branch (luis.soares:3501) Bug#12416700

[Luis Soares]

#At file:///home/lsoares/Workspace/bzr/work/bugfixing/12416700/mysql-5.5/ based on revid:serge.kozlov@stripped

 3501 Luis Soares	2011-05-10
      BUG#12416700: RPL_SHOW_SLAVE_HOSTS FAILS SPORADICALLY (TIMEOUT 
                    IN WAIT_SHOW_CONDITION) 
      
      There was a typo in the name of one of the parameters to the
      include file wait_show_condition. The parameter name was being
      set to "connection" instead of "condition".
      
      We fix this typo, improve one instruction in the test case and
      deploy parameter checks inside wait_show_condition.inc.

    modified:
      mysql-test/include/wait_show_condition.inc
      mysql-test/suite/rpl/r/rpl_show_slave_hosts.result
      mysql-test/suite/rpl/t/rpl_show_slave_hosts.test
=== modified file 'mysql-test/include/wait_show_condition.inc'
--- a/mysql-test/include/wait_show_condition.inc	2010-11-19 10:26:43 +0000
+++ b/mysql-test/include/wait_show_condition.inc	2011-05-10 11:41:09 +0000
@@ -31,6 +31,21 @@
 # Created: 2009-02-18 mleich
 #
 
+if (!$condition)
+{
+  --die ERROR IN TEST: the "condition" variable must be set
+}
+
+if (!$field)
+{
+  --die ERROR IN TEST: the "field" variable must be set
+}
+
+if (!$show_statement)
+{
+  --die ERROR IN TEST: the "show_statement" variable must be set
+}
+
 let $max_run_time= 30;
 if ($wait_timeout)
 {

=== modified file 'mysql-test/suite/rpl/r/rpl_show_slave_hosts.result'
--- a/mysql-test/suite/rpl/r/rpl_show_slave_hosts.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_show_slave_hosts.result	2011-05-10 11:41:09 +0000
@@ -8,8 +8,7 @@ SHOW SLAVE HOSTS;
 Server_id	Host	Port	Master_id
 3	slave2	DEFAULT_PORT	1
 2		SLAVE_PORT	1
-STOP SLAVE IO_THREAD;
-include/wait_for_slave_io_to_stop.inc
+include/stop_slave_io.inc
 SHOW SLAVE HOSTS;
 Server_id	Host	Port	Master_id
 2		SLAVE_PORT	1

=== modified file 'mysql-test/suite/rpl/t/rpl_show_slave_hosts.test'
--- a/mysql-test/suite/rpl/t/rpl_show_slave_hosts.test	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/t/rpl_show_slave_hosts.test	2011-05-10 11:41:09 +0000
@@ -23,14 +23,13 @@ connection master;
 let $show_statement= SHOW SLAVE HOSTS;
 let $field= Server_id;
 # 3 is server_id of slave2.
-let $connection= ='3';
+let $condition= ='3';
 source include/wait_show_condition.inc;
 --replace_result $SLAVE_MYPORT SLAVE_PORT $DEFAULT_MASTER_PORT DEFAULT_PORT
 SHOW SLAVE HOSTS;
 
 connection slave2;
-STOP SLAVE IO_THREAD;
-source include/wait_for_slave_io_to_stop.inc;
+--source include/stop_slave_io.inc
 
 connection master;
 let $show_statement= SHOW SLAVE HOSTS;


Attachment: [text/bzr-bundle] bzr/[e-mail]