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

 3620 Nuno Carvalho	2012-02-21
      WL#5223: Binary Log Group Commit
      
      Updated rpl_row_show_relaylog_events.result file with last commit
      changes.

    modified:
      mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result
 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
=== modified file 'mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result'
--- a/mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result	2012-02-19 20:40:25 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result	2012-02-21 20:29:02 +0000
@@ -95,7 +95,6 @@ slave-bin.000001	#	Query	#	#	COMMIT
 ******** [slave] SHOW RELAYLOG EVENTS IN <FILE> ********
 show relaylog events in 'slave-relay-bin.000003' from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-relay-bin.000003	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
 slave-relay-bin.000003	#	Rotate	#	#	master-bin.000001;pos=4
 slave-relay-bin.000003	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
 slave-relay-bin.000003	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
@@ -114,13 +113,13 @@ slave-relay-bin.000003	#	Query	#	#	COMMI
 ******** [slave] SHOW RELAYLOG EVENTS IN <FILE> LIMIT 1 ********
 show relaylog events in 'slave-relay-bin.000003' from <binlog_start> limit 1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-relay-bin.000003	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
+slave-relay-bin.000003	#	Rotate	#	#	master-bin.000001;pos=4
 ******** [slave] SHOW RELAYLOG EVENTS IN <FILE> LIMIT 1,3 ********
 show relaylog events in 'slave-relay-bin.000003' from <binlog_start> limit 1,3;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-relay-bin.000003	#	Rotate	#	#	master-bin.000001;pos=4
 slave-relay-bin.000003	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
 slave-relay-bin.000003	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+slave-relay-bin.000003	#	Query	#	#	BEGIN
 ******** [slave] SHOW RELAYLOG EVENTS  ********
 show relaylog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -187,24 +186,21 @@ slave-bin.000001	#	Rotate	#	#	slave-bin.
 ******** [slave] SHOW RELAYLOG EVENTS IN <FILE> ********
 show relaylog events in 'slave-relay-bin.000006' from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-relay-bin.000006	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
 slave-relay-bin.000006	#	Rotate	#	#	master-bin.000002;pos=4
 slave-relay-bin.000006	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
 slave-relay-bin.000006	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
 ******** [slave] SHOW RELAYLOG EVENTS IN <FILE> LIMIT 1 ********
 show relaylog events in 'slave-relay-bin.000006' from <binlog_start> limit 1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-relay-bin.000006	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
+slave-relay-bin.000006	#	Rotate	#	#	master-bin.000002;pos=4
 ******** [slave] SHOW RELAYLOG EVENTS IN <FILE> LIMIT 1,3 ********
 show relaylog events in 'slave-relay-bin.000006' from <binlog_start> limit 1,3;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-relay-bin.000006	#	Rotate	#	#	master-bin.000002;pos=4
 slave-relay-bin.000006	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
 slave-relay-bin.000006	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
 ******** [slave] SHOW RELAYLOG EVENTS  ********
 show relaylog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-relay-bin.000005	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
 slave-relay-bin.000005	#	Rotate	#	#	master-bin.000002;pos=4
 slave-relay-bin.000005	#	Rotate	#	#	slave-relay-bin.000006;pos=4
 include/rpl_end.inc

No bundle (reason: useless for push emails).