From: Nuno Carvalho
Date: February 21 2012 6:25pm
Subject: bzr push into mysql-trunk branch (nuno.carvalho:3618 to 3619) WL#5223
List-Archive: http://lists.mysql.com/commits/143017
Message-Id: <201202211825.q1LIPYVX020350@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3619 Nuno Carvalho	2012-02-21
      WL#5223: Binary Log Group Commit
      
      Reverted change on rpl_slave.cc that cause valgrind errors handling
      Format_description_log_event.

    modified:
      sql/rpl_slave.cc
 3618 Mats Kindahl	2012-02-20
      WL#5223: Binary Log Group Commit
      
      Fixes for review comments by Luis.
      
      - Removing unecessary variables.
      - Adding comments to functions.
      - Simplifying an if-statement.
      - Removing debug printouts that are no longer needed.

    modified:
      sql/binlog.cc
=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2012-02-19 20:40:25 +0000
+++ b/sql/rpl_slave.cc	2012-02-21 18:24:39 +0000
@@ -5147,7 +5147,7 @@ static int process_io_rotate(Master_info
     no need to reset description_event_for_queue now. And if it's nothing (same
     master version as before), no need (still using the slave's format).
   */
-  if (mi->rli->relay_log.description_event_for_queue->binlog_version < 4)
+  if (mi->rli->relay_log.description_event_for_queue->binlog_version >= 4)
   {
     DBUG_ASSERT(mi->rli->relay_log.description_event_for_queue->checksum_alg ==
                 mi->rli->relay_log.relay_log_checksum_alg);

No bundle (reason: useless for push emails).