Merge from mysql-5.5 to mysql-5.6

Sujatha Sivakumar · Sujatha Sivakumar · commit bca437099766 · 2013-09-23T14:02:32.000+05:30
diff --git a/plugin/semisync/semisync_master.cc b/plugin/semisync/semisync_master.cc
@@ -760,7 +760,8 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
       At this point, the binlog file and position of this transaction
       must have been removed from ActiveTranx.
     */
-    assert(!active_tranxs_->is_tranx_end_pos(trx_wait_binlog_name,
+    assert(!getMasterEnabled() ||
+           !active_tranxs_->is_tranx_end_pos(trx_wait_binlog_name,
                                              trx_wait_binlog_pos));
     
     /* Update the status counter. */
