bzr commit into mysql-trunk branch (andrei.elkin:3773) Bug#11765758

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/2a-23May/FIXES/bug11765758-rpl_corruption/ based on revid:andrei.elkin@stripped

 3773 Andrei Elkin	2011-03-21
      bug# 11765758 rpl_corruption failed on PB2.
      
      The 2nd patch to remove extra warninings in two test results.
     @ mysql-test/extra/rpl_tests/rpl_stop_middle_group.test
        removed an extra stop-slave, explained why.
     @ mysql-test/suite/rpl/r/rpl_init_slave_errors.result
        results got updated.
     @ mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result
        results got updated.
     @ mysql-test/suite/rpl/t/rpl_init_slave_errors.test
        asserted the stopped IO thread in a particular context.

    modified:
      mysql-test/extra/rpl_tests/rpl_stop_middle_group.test
      mysql-test/suite/rpl/r/rpl_init_slave_errors.result
      mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result
      mysql-test/suite/rpl/t/rpl_init_slave_errors.test
=== modified file 'mysql-test/extra/rpl_tests/rpl_stop_middle_group.test'
--- a/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test	2011-03-17 18:13:10 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test	2011-03-21 16:04:11 +0000
@@ -111,7 +111,9 @@ set @@global.debug="-d";
 #
 # The mixed multi-table update
 #
-stop slave;
+
+# above tests for Bug#11765758 - 58754 made sure slave is down
+
 truncate table tm;
 source include/start_slave.inc;
 

=== modified file 'mysql-test/suite/rpl/r/rpl_init_slave_errors.result'
--- a/mysql-test/suite/rpl/r/rpl_init_slave_errors.result	2011-03-17 18:13:10 +0000
+++ b/mysql-test/suite/rpl/r/rpl_init_slave_errors.result	2011-03-21 16:04:11 +0000
@@ -7,9 +7,7 @@ start slave;
 include/wait_for_slave_sql_error.inc [errno=1593]
 Last_SQL_Error = 'Failed during slave thread initialization'
 call mtr.add_suppression("Failed during slave.* thread initialization");
-include/stop_slave_io.inc
-Warnings:
-Note	1255	Slave already has been stopped
+# Asserted this: SHOW SLAVE STATUS should return No IO thread running status
 SET GLOBAL debug= "";
 reset slave;
 SET GLOBAL init_slave= "garbage";

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result	2011-03-17 18:13:10 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result	2011-03-21 16:04:11 +0000
@@ -38,9 +38,6 @@ include/assert.inc [There is one row in 
 include/assert.inc [There is no row in table ti]
 include/stop_slave.inc
 set @@global.debug="-d";
-stop slave;
-Warnings:
-Note	1255	Slave already has been stopped
 truncate table tm;
 include/start_slave.inc
 set @@global.debug="+d,stop_slave_middle_group";

=== modified file 'mysql-test/suite/rpl/t/rpl_init_slave_errors.test'
--- a/mysql-test/suite/rpl/t/rpl_init_slave_errors.test	2011-03-17 18:13:10 +0000
+++ b/mysql-test/suite/rpl/t/rpl_init_slave_errors.test	2011-03-21 16:04:11 +0000
@@ -61,8 +61,13 @@ start slave;
 call mtr.add_suppression("Failed during slave.* thread initialization");
 
 # Bug#11765758 - 58754
-# make sure the IO thread is down to allow safe updating to @@global.debug
---source include/stop_slave_io.inc
+# above tests part logics make sure the IO thread is down to allow 
+# safe updating to @@global.debug
+
+--let $assert_text= SHOW SLAVE STATUS should return No IO thread running status
+--let $assert_cond= "[SHOW SLAVE STATUS, Slave_IO_Running, 1]" like "No"
+--source include/rpl_assert.inc
+
 SET GLOBAL debug= "";
 
 ######################################################################


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