bzr commit into mysql-next-mr-wl5569 branch (Serge.Kozlov:3311) WL#5569

[Serge Kozlov]

#At file:///home/ksm/oracle/repo/MTS/build-next-mr/ based on revid:andrei.elkin@stripped

 3311 Serge Kozlov	2011-06-20
      WL#5569, fix for rpl_bug26395

    modified:
      mysql-test/include/rpl_init.inc
      mysql-test/include/start_slave.inc
      mysql-test/suite/rpl/t/rpl_bug26395.test
=== modified file 'mysql-test/include/rpl_init.inc'
--- a/mysql-test/include/rpl_init.inc	2010-12-20 14:15:01 +0000
+++ b/mysql-test/include/rpl_init.inc	2011-06-20 11:11:59 +0000
@@ -226,13 +226,11 @@ if ($rpl_check_server_ids)
 --let $rpl_master_list= `SELECT REPEAT('x', $rpl_server_count * LENGTH($rpl_server_count))`
 --source include/rpl_change_topology.inc
 
-
 if (!$rpl_skip_start_slave)
 {
   --source include/rpl_start_slaves.inc
 }
 
-
 --let $rpl_connection_name= server_1
 --source include/rpl_connection.inc
 

=== modified file 'mysql-test/include/start_slave.inc'
--- a/mysql-test/include/start_slave.inc	2010-12-19 17:07:28 +0000
+++ b/mysql-test/include/start_slave.inc	2011-06-20 11:11:59 +0000
@@ -30,8 +30,9 @@ if (!$rpl_debug)
   --disable_query_log
 }
 
-
+--disable_warnings
 START SLAVE;
+--enable_warnings
 source include/wait_for_slave_to_start.inc;
 
 

=== modified file 'mysql-test/suite/rpl/t/rpl_bug26395.test'
--- a/mysql-test/suite/rpl/t/rpl_bug26395.test	2011-06-08 20:18:08 +0000
+++ b/mysql-test/suite/rpl/t/rpl_bug26395.test	2011-06-20 11:11:59 +0000
@@ -37,10 +37,13 @@ source include/have_innodb.inc;
 source include/have_debug.inc;
 source include/master-slave.inc;
 
-# test adapts simulation of incomplete transaction that MTS does not tolerate
-# when is stopped. So it reacts with an error whereas the single-threaded is fine.
--- source include/not_mts_slave_parallel_workers.inc
+# we just ignore some warnings for MTS
 
+if (`SELECT @@slave_parallel_workers > 0`) {
+  --disable_query_log
+  call mtr.add_suppression('The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state');
+  --enable_query_log
+}
 
 --echo ==== Initialize ====
 


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