From: Andrei Elkin
Date: April 16 2012 2:09pm
Subject: bzr push into mysql-trunk branch (andrei.elkin:3880 to 3881) Bug#13893310
List-Archive: http://lists.mysql.com/commits/143580
X-Bug: 13893310
Message-Id: <201204161409.q3GE96wA004615@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3881 Andrei Elkin	2012-04-16
      Bug#13893310
      
      refining rpl_parallel_start_stop that turned out to be not deterministic
      after Bug#13893310 fixes.
      A removed line from the test does not affect the test logics flow.
      Oth UNTIL SQL_AFTER_MTS_GAPS is rigorously checked out in *crash_safe* family.

    modified:
      mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
      mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
 3880 gopal.shankar@stripped	2012-04-16
      Post fix after push for Bug#11815557. Error codes were shifted by 1 in trunk, due to addition of new error code in 5.5.

    modified:
      mysql-test/extra/rpl_tests/rpl_loaddata.test
      mysql-test/suite/rpl/r/rpl_loaddata.result
      mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_start_stop.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_start_stop.result	2012-04-11 16:52:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_start_stop.result	2012-04-16 11:28:43 +0000
@@ -90,10 +90,6 @@ start slave until sql_after_mts_gaps mas
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'master_log_pos=0' at line 1
 start slave until sql_after_mts_gaps SQL_BEFORE_GTIDS='dummy';
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SQL_BEFORE_GTIDS='dummy'' at line 1
-start slave until sql_after_mts_gaps;
-show warnings;
-Level	Code	Message
-Error	1064	You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SQL_BEFORE_GTIDS='dummy'' at line 1
 call mtr.add_suppression('Slave SQL: Could not execute Update_rows event on table d1.t1; Deadlock found when trying to get lock');
 include/start_slave.inc
 create database d1;

=== modified file 'mysql-test/suite/rpl/t/rpl_parallel_start_stop.test'
--- a/mysql-test/suite/rpl/t/rpl_parallel_start_stop.test	2012-04-11 16:52:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel_start_stop.test	2012-04-16 11:28:43 +0000
@@ -310,10 +310,6 @@ start slave until sql_after_mts_gaps mas
 --error 1064
 start slave until sql_after_mts_gaps SQL_BEFORE_GTIDS='dummy';
 
-# check out a "blank" run which leaves an info line into error-log
-start slave until sql_after_mts_gaps;
-
-show warnings;
 call mtr.add_suppression('Slave SQL: Could not execute Update_rows event on table d1.t1; Deadlock found when trying to get lock');
 
 # regular start now

No bundle (reason: useless for push emails).