From: Rohit Kalhans
Date: December 22 2011 12:47pm
Subject: bzr push into mysql-trunk-wl5597 branch (rohit.kalhans:3651 to 3652) WL#5597
List-Archive: http://lists.mysql.com/commits/142238
Message-Id: <201112221247.pBMClfZB026416@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3652 Rohit Kalhans	2011-12-22
      WL#5597: fixed test failures
      The following tests have been fixed 
       1. main.mysqld-help-win
       2. rpl.rpl_parallel_start_stop
       3. rpl.rpl_relayrotate

    modified:
      mysql-test/r/mysqld--help-win.result
      mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
      mysql-test/suite/rpl/r/rpl_relayrotate.result
      mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
      mysql-test/suite/rpl/t/rpl_relayrotate.test
 3651 Rohit Kalhans	2011-12-15
      WL#5597: Removed test rpl_row_find_row_debug as this test is now obsolete.

    removed:
      mysql-test/suite/rpl/r/rpl_row_find_row_debug.result
      mysql-test/suite/rpl/t/rpl_row_find_row_debug.test
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2011-12-15 09:17:25 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2011-12-22 12:46:37 +0000
@@ -1108,8 +1108,8 @@ slave-compressed-protocol FALSE
 slave-exec-mode STRICT
 slave-net-timeout 3600
 slave-parallel-workers 0
-slave-rows-search-algorithms TABLE_SCAN,INDEX_SCAN
 slave-pending-jobs-size-max 16777216
+slave-rows-search-algorithms TABLE_SCAN,INDEX_SCAN
 slave-skip-errors (No default value)
 slave-sql-verify-checksum TRUE
 slave-transaction-retries 10

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_start_stop.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_start_stop.result	2011-11-19 08:08:03 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_start_stop.result	2011-12-22 12:46:37 +0000
@@ -35,6 +35,7 @@ insert into t2m values (1);
 begin;
 update t1 set a=31 where a=3;
 insert into t1 values (5),(6),(7);
+update t1 set a=a+10;
 begin;
 update t1 set a=20 where a=2;
 insert into t2m values (2);

=== modified file 'mysql-test/suite/rpl/r/rpl_relayrotate.result'
--- a/mysql-test/suite/rpl/r/rpl_relayrotate.result	2011-11-19 08:08:03 +0000
+++ b/mysql-test/suite/rpl/r/rpl_relayrotate.result	2011-12-22 12:46:37 +0000
@@ -1,3 +1,4 @@
+call mtr.add_suppression('Slave SQL: Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group');
 include/master-slave.inc
 Warnings:
 Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.

=== modified file 'mysql-test/suite/rpl/t/rpl_parallel_start_stop.test'
--- a/mysql-test/suite/rpl/t/rpl_parallel_start_stop.test	2011-10-13 14:01:50 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel_start_stop.test	2011-12-22 12:46:37 +0000
@@ -148,6 +148,7 @@ begin;
 # set up a deadlock
 update t1 set a=31 where a=3;
 insert into t1 values (5),(6),(7);
+update t1 set a=a+10;
 
 connection master;
 

=== modified file 'mysql-test/suite/rpl/t/rpl_relayrotate.test'
--- a/mysql-test/suite/rpl/t/rpl_relayrotate.test	2010-12-19 17:07:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_relayrotate.test	2011-12-22 12:46:37 +0000
@@ -4,6 +4,7 @@
 # Added comments section and to skip when ndb is      #
 # Default engine.                                     #
 #######################################################
+call mtr.add_suppression('Slave SQL: Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group');
 -- source include/not_ndb_default.inc
 -- source include/have_innodb.inc
 -- source include/master-slave.inc

No bundle (reason: useless for push emails).