List:Commits« Previous MessageNext Message »
From:Luis Soares Date:September 8 2011 10:16am
Subject:bzr push into mysql-trunk branch (luis.soares:3449 to 3450) Bug#12818224
View as plain text  
 3450 Luis Soares	2011-09-08 [merge]
      BUG#12818224
      
      Automerged mysql-5.5 into latest mysql-trunk.

    modified:
      plugin/semisync/semisync_master.cc
 3449 Jimmy Yang	2011-09-08
      Fix Bug #12960058 - INNODB.INNODB-SYSTEM-TABLE-VIEW FAILS WITH
      ASSERTION IN SYNC0RW.IC
      
      rb://759 approved by marko

    modified:
      storage/innobase/dict/dict0load.c
      storage/innobase/handler/i_s.cc
      storage/innobase/include/dict0load.h
=== modified file 'plugin/semisync/semisync_master.cc'
--- a/plugin/semisync/semisync_master.cc	2011-07-21 16:27:14 +0000
+++ b/plugin/semisync/semisync_master.cc	2011-09-08 10:14:08 +0000
@@ -312,18 +312,18 @@ int ActiveTranx::clear_active_tranx_node
  * The most important functions during semi-syn replication listed:
  *
  * Master:
- *  . reportReplyBinlog(): called by the binlog dump thread when it receives
- *                         the slave's status information.
- *  . updateSyncHeader():  based on transaction waiting information, decide
- *                         whether to request the slave to reply.
- *  . writeTraxInBinlog(): called by the transaction thread when it finishes
- *                         writing all transaction events in binlog.
- *  . commitTrx():         transaction thread wait for the slave reply.
+ *  . reportReplyBinlog():  called by the binlog dump thread when it receives
+ *                          the slave's status information.
+ *  . updateSyncHeader():   based on transaction waiting information, decide
+ *                          whether to request the slave to reply.
+ *  . writeTranxInBinlog(): called by the transaction thread when it finishes
+ *                          writing all transaction events in binlog.
+ *  . commitTrx():          transaction thread wait for the slave reply.
  *
  * Slave:
  *  . slaveReadSyncHeader(): read the semi-sync header from the master, get the
- *                         sync status and get the payload for events.
- *  . slaveReply():        reply to the master about the replication progress.
+ *                           sync status and get the payload for events.
+ *  . slaveReply():          reply to the master about the replication progress.
  *
  ******************************************************************************/
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (luis.soares:3449 to 3450) Bug#12818224Luis Soares8 Sep