From: Nuno Carvalho
Date: July 13 2012 9:34am
Subject: bzr push into mysql-5.6 branch (nuno.carvalho:4020 to 4021) Bug#14310067
List-Archive: http://lists.mysql.com/commits/144437
X-Bug: 14310067
Message-Id: <20120713093406.7939.20822.4021@localhost>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4021 Nuno Carvalho	2012-07-13 [merge]
      BUG#14310067: RPL_CANT_READ_EVENT_INCIDENT AND RPL_BUG41902 FAIL ON 5.5
      
      Merge from mysql-5.5 to mysql-5.6.
      
      Conflicts:
       * mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result
       * mysql-test/suite/rpl/t/rpl_bug41902.test
       * mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test

    modified:
      mysql-test/suite/rpl/t/rpl_bug41902.test
 4020 Marc Alff	2012-07-13
      Bug#14281066 - PERFSCHEMA.PRIVILEGE_TABLE_IO FAILS ON PB2 SPORADICALLY
      
      Before this fix, the test privilege_table_io could fail,
      printing table io events for spurious deleted records in mysql.* tables.
      
      This fix improves the test robustness, by extending the fix already done
      for table mysql.db to every mysql.* tables involved.

    modified:
      mysql-test/suite/perfschema/r/privilege_table_io.result
      mysql-test/suite/perfschema/t/privilege_table_io.test
=== modified file 'mysql-test/suite/rpl/t/rpl_bug41902.test'
--- a/mysql-test/suite/rpl/t/rpl_bug41902.test	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_bug41902.test	2012-07-13 09:22:59 +0000
@@ -7,7 +7,7 @@ source include/master-slave.inc;
 
 -- disable_query_log
 CALL mtr.add_suppression("Failed to locate old binlog or relay log files");
-CALL mtr.add_suppression('MYSQL_BIN_LOG::purge_logs was called with file ./master-bin.000001 not listed in the index.');
+CALL mtr.add_suppression('MYSQL_BIN_LOG::purge_logs was called with file ..master-bin.000001 not listed in the index.');
 -- enable_query_log
 sync_slave_with_master;
 

No bundle (reason: useless for push emails).