bzr push into mysql-trunk branch (nuno.carvalho:3923 to 3924) WL#5223

[Nuno Carvalho]

 3924 Nuno Carvalho	2012-05-30
      WL#5223: Binary Log Group Commit
      
      Added waiting conditions to rpl_semi_sync test when semi sync master
      status depend on round trip to slave to avoid test failures (result
      content mismatch) on slow platforms.

    modified:
      mysql-test/suite/rpl/t/rpl_semi_sync.test
 3923 Nuno Carvalho	2012-05-30 [merge]
      BUG#14135691: MISSING INITIALIZATION OF MYSQL_BIN_LOG::SYNC_COUNTER
      
      Empty merge from mysql-5.5 into mysql-trunk.

=== modified file 'mysql-test/suite/rpl/t/rpl_semi_sync.test'
--- a/mysql-test/suite/rpl/t/rpl_semi_sync.test	2012-05-29 13:49:39 +0000
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync.test	2012-05-30 14:28:52 +0000
@@ -437,6 +437,12 @@ select * from t1;
 connection master;
 echo [ on master ];
 
+# Wait until master semi-sync status is on again after slave catches up
+# to avoid test failures on slow platforms.
+let $status_var= Rpl_semi_sync_master_status;
+let $status_var_value= ON;
+source include/wait_for_status_var.inc;
+
 echo [ master semi-sync status should be ON ];
 show status like 'Rpl_semi_sync_master_status';
 show status like 'Rpl_semi_sync_master_no_tx';

No bundle (reason: useless for push emails).