From: Nuno Carvalho
Date: August 21 2012 10:32am
Subject: bzr push into mysql-trunk branch (nuno.carvalho:4263 to 4264) Bug#14116526
List-Archive: http://lists.mysql.com/commits/144587
X-Bug: 14116526
Message-Id: <20120821103241.31782.71583.4264@localhost>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4264 Nuno Carvalho	2012-08-21 [merge]
      BUG#14116526: RPL.RPL_GTID_SQL_UNTIL_BEFORE_AFTER FAILS WITH RESULT LENGTH MISMATCH ON TRUNK.
      
      Merge from mysql-5.6 into mysql-trunk.

    modified:
      mysql-test/suite/rpl/r/rpl_gtid_sql_until_before_after.result
      mysql-test/suite/rpl/t/rpl_gtid_sql_until_before_after.test
 4263 Manish Kumar	2012-08-21 [merge]
      BUG#14381701 - DELETING FROM A HASH WHILE ITERATING OVER IT IS WRONG
      
      Upmerge from mysql-5.6 -> mysql-trunk

    modified:
      sql/rpl_rli_pdb.cc
=== modified file 'mysql-test/suite/rpl/r/rpl_gtid_sql_until_before_after.result'
--- a/mysql-test/suite/rpl/r/rpl_gtid_sql_until_before_after.result	2012-05-08 17:11:38 +0000
+++ b/mysql-test/suite/rpl/r/rpl_gtid_sql_until_before_after.result	2012-08-21 10:27:20 +0000
@@ -111,7 +111,7 @@ c1
 9
 Sync slave with master
 include/start_slave.inc
-SELECT SQL_THREAD_WAIT_AFTER_GTIDS('MASTER_UUID:10', 300);
+SELECT SQL_THREAD_WAIT_AFTER_GTIDS('MASTER_UUID:10');
 SELECT * FROM t1;
 c1
 2

=== modified file 'mysql-test/suite/rpl/t/rpl_gtid_sql_until_before_after.test'
--- a/mysql-test/suite/rpl/t/rpl_gtid_sql_until_before_after.test	2012-05-08 17:11:38 +0000
+++ b/mysql-test/suite/rpl/t/rpl_gtid_sql_until_before_after.test	2012-08-21 10:27:20 +0000
@@ -139,7 +139,7 @@ SELECT * FROM t1;
 --replace_result $master_uuid MASTER_UUID
 --enable_query_log
 --disable_result_log
---eval SELECT SQL_THREAD_WAIT_AFTER_GTIDS('$master_uuid:10', 300)
+--eval SELECT SQL_THREAD_WAIT_AFTER_GTIDS('$master_uuid:10')
 --enable_result_log
 SELECT * FROM t1;
 

No bundle (reason: useless for push emails).