bzr push into mysql-trunk branch (Serge.Kozlov:4004 to 4005) Bug#13854078

[Serge Kozlov]

 4005 Serge Kozlov	2012-06-13
      BUG#13854078. Fix the race condition for concurrent tests:
      Concurrent tests require two or more connections and at least one connection sends the statements in async mode (via send/reap command). We need to make sure that SET GTID_NEXT is completed for all connections before getting values of GTID variables and if COMMIT/ROLLBACK executed for any connection.

    modified:
      mysql-test/suite/rpl/t/rpl_gtid_execution.test
 4004 Manish Kumar	2012-06-13 [merge]
      BUG#12400221 - 60926: BINARY LOG EVENTS LARGER THAN MAX_ALLOWED_PACKET
      
      Null merge from mysql-5.5->mysql-trunk

=== modified file 'mysql-test/suite/rpl/t/rpl_gtid_execution.test'
--- a/mysql-test/suite/rpl/t/rpl_gtid_execution.test	2012-02-22 11:15:34 +0000
+++ b/mysql-test/suite/rpl/t/rpl_gtid_execution.test	2012-06-13 17:01:04 +0000
@@ -484,7 +484,16 @@ while ($id <= $max_id)
     {
       --sync_slave_with_master
       --connection master
-
+      # Concurrent tests require two or more connections and at least one connection sends  
+      # the statements in async mode (via send/reap command). We need to make sure that
+      # SET GTID_NEXT is completed for all connections before getting values of 
+      # GTID variables and if COMMIT/ROLLBACK executed for any connection.
+      if (`SELECT '$stmt' REGEXP '^(COMMIT|ROLLBACK)\$'`)
+      {
+        --let $wait_condition= SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State LIKE 'waiting for GTID %'
+        --source include/wait_condition.inc
+      }
+                                              
       --let $text_0= @@GLOBAL.GTID_DONE
       --let $after_0= [server_1_$connection:SELECT @@GLOBAL.GTID_DONE]
       --let $before_0= @global_gtid_done

No bundle (reason: useless for push emails).