List:Commits« Previous MessageNext Message »
From:Luis Soares Date:January 5 2012 5:39pm
Subject:bzr push into mysql-trunk-wl3584 branch (luis.soares:3544 to 3545)
View as plain text  
 3545 Luis Soares	2012-01-05 [merge]
      Automerged from test fixing clone.

    modified:
      mysql-test/r/mysql_binary_mode.result
      mysql-test/r/mysqlbinlog_base64.result
      mysql-test/suite/rpl/r/rpl_checksum.result
      mysql-test/suite/rpl/r/rpl_row_event_max_size.result
      mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
      mysql-test/suite/rpl/t/rpl_checksum.test
      mysql-test/suite/rpl/t/rpl_row_event_max_size.test
      mysql-test/suite/rpl/t/rpl_row_ignorable_event.test
      mysql-test/t/mysql_binary_mode.test
      mysql-test/t/mysqlbinlog_base64.test
 3544 Alfranio Correia	2012-01-05
      Changed the implementation of the START SLAVE UNTIL as
      requested by Sven.

    modified:
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/rpl_slave.cc
      sql/zgtids.h
=== modified file 'mysql-test/r/mysql_binary_mode.result'
--- a/mysql-test/r/mysql_binary_mode.result	2011-07-28 14:53:46 +0000
+++ b/mysql-test/r/mysql_binary_mode.result	2012-01-05 10:44:47 +0000
@@ -24,6 +24,7 @@ FLUSH LOGS;
 DROP TABLE `A
 B`;
 
+RESET MASTER;
 # '--exec mysql ...' without --binary-mode option
 # It creates the table with a wrong table name and generates an error.
 # (error output was suppressed to make the test case platform agnostic)
@@ -34,6 +35,7 @@ DROP TABLE `TABLE_NAME_MASKED`;
 
 # In binary_mode, table name '0x410D0A42' and string '0x410042' can be
 # handled correctly.
+RESET MASTER;
 SELECT HEX(c1) FROM `A
 B`;
 HEX(c1)

=== modified file 'mysql-test/r/mysqlbinlog_base64.result'
--- a/mysql-test/r/mysqlbinlog_base64.result	2011-05-05 22:48:15 +0000
+++ b/mysql-test/r/mysqlbinlog_base64.result	2012-01-05 10:56:37 +0000
@@ -10,6 +10,7 @@ load data infile '../../std_data/words.d
 flush logs;
 drop table t1;
 drop table t2;
+RESET MASTER;
 select * from t1;
 a
 1
@@ -104,6 +105,7 @@ select count(*) from t2;
 count(*)
 35840
 flush logs;
+RESET MASTER;
 select count(*) from t2;
 count(*)
 35840

=== modified file 'mysql-test/suite/rpl/r/rpl_checksum.result'
--- a/mysql-test/suite/rpl/r/rpl_checksum.result	2011-10-28 21:22:19 +0000
+++ b/mysql-test/suite/rpl/r/rpl_checksum.result	2012-01-05 15:25:25 +0000
@@ -98,6 +98,7 @@ must be zero
 0
 stop slave;
 reset slave;
+reset master;
 set @@global.binlog_checksum= IF(floor((rand()*1000)%2), "CRC32", "NONE");
 flush logs;
 set @@global.binlog_checksum= CRC32;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_event_max_size.result'
--- a/mysql-test/suite/rpl/r/rpl_row_event_max_size.result	2011-10-03 11:49:38 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_event_max_size.result	2012-01-05 15:59:28 +0000
@@ -8,6 +8,8 @@ DELETE FROM t1 WHERE a = 1;
 SELECT LENGTH(data1), LENGTH(data2) FROM t1 WHERE a = 1;
 LENGTH(data1)	LENGTH(data2)
 SET @@global.max_allowed_packet=4194304;
+FLUSH LOGS;
+include/rpl_reset.inc
 # On master, test the added 'binlog-row-event-max-size' mysqlbinlog option
 # works fine and the data is inserted by executing the dumped ROW event
 SELECT LENGTH(data1), LENGTH(data2) FROM t1 WHERE a = 1;
@@ -17,20 +19,12 @@ set @@global.max_allowed_packet= 1048576
 INSERT INTO t1 (data1, data2) VALUES (repeat('a',1048576), repeat('a',1048576));
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE t1 (a int not null auto_increment, data1 LONGBLOB,
-data2 LONGBLOB, PRIMARY KEY(a))
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	1	#	COMMIT
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Delete_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	1	#	COMMIT
+master-bin.000001	#	Gtid	1	#	SET @@SESSION.GTID_NEXT= 'GTID';
 master-bin.000001	#	Query	1	#	BEGIN
 master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	1	#	COMMIT
+master-bin.000001	#	Gtid	1	#	SET @@SESSION.GTID_NEXT= 'GTID';
 master-bin.000001	#	Query	1	#	BEGIN
 master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
@@ -48,6 +42,7 @@ SELECT LENGTH(data1), LENGTH(data2) FROM
 LENGTH(data1)	LENGTH(data2)
 1048576	1048576
 DROP TABLE t1;
+include/rpl_reset.inc
 # Test it will cause ER_MASTER_FATAL_ERROR_READING_BINLOG when the value
 # of the bigger one of max_allowed_packet and binlog_row_event_max_size
 # is lower than the the required size.
@@ -66,4 +61,5 @@ include/wait_for_slave_io_error.inc [err
 ==== clean up ====
 include/stop_slave_sql.inc
 RESET SLAVE;
+RESET MASTER;
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_row_ignorable_event.result'
--- a/mysql-test/suite/rpl/r/rpl_row_ignorable_event.result	2011-12-20 17:06:52 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_ignorable_event.result	2012-01-05 17:34:33 +0000
@@ -179,13 +179,14 @@ master-bin.000001	#	Gtid	#	#	SET @@SESSI
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t3`,`t6` /* generated by server */
 master-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t4`,`t5` /* generated by server */
-# MYSQL_BINLOG output base on master-bin.000001
+FLUSH LOGS;
+RESET MASTER;
+# MYSQL_BINLOG output based on a saved copy of master-bin.000001
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #
 #server id #  end_log_pos # 	Start: binlog v#, server v #.##.## created # #:#:# at startup
-# Warning: this binlog is either in use or was not closed properly.
 ROLLBACK/*!*/;
 # at #
 #server id #  end_log_pos # 	Previous-GTIDs
@@ -916,6 +917,8 @@ SET @@SESSION.GTID_NEXT= 'GTID'/*!*/;
 SET TIMESTAMP=t/*!*/;
 DROP TABLE `t4`,`t5` /* generated by server */
 /*!*/;
+# at #
+#server id #  end_log_pos # 	Rotate to master-bin.000002  pos: 4
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
@@ -924,6 +927,63 @@ ROLLBACK /* added by mysqlbinlog */;
 # SHOW BINLOG EVENTS ON MASTER after '--exec MYSQL_BINLOG'
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
+master-bin.000001	#	Query	#	#	use `test`; create table t1(a int, b int) engine= myisam
+master-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Rows_query	#	#	# insert into t1(a,b) values(1,1),(2,1)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Rows_query	#	#	# update t1 set a = a + 5 where b = 1 LIMIT 1
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Rows_query	#	#	# delete from t1 where a = 6
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Delete_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
+master-bin.000001	#	Query	#	#	use `test`; create table t2(a int, b int) engine=innodb
+master-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Rows_query	#	#	# insert into t2(a,b) values(2,1),(3,1)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Rows_query	#	#	# update t2 set a = a + 5 where b = 1
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
+master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Rows_query	#	#	# delete from t2 where a = 7
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
+master-bin.000001	#	Delete_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+master-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Rows_query	#	#	# insert into t1(a,b) values(1,5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Rows_query	#	#	# insert into t1(a,b) values(1,7)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Rows_query	#	#	# insert into t2(a,b) values(2,5)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Rows_query	#	#	# insert into t2(a,b) values(2,6)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+master-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1`,`t2` /* generated by server */
 # SHOW BINLOG EVENTS ON 2nd CONNECTION TO MASTE
 set @@session.binlog_rows_query_log_events= off;
 # Test statements from the 2nd connection have no comment event
@@ -966,8 +1026,6 @@ show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Previous_gtids	#	#	
 slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
 slave-bin.000001	#	Query	#	#	use `test`; create table t1(a int, b int) engine= myisam
 slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
 slave-bin.000001	#	Query	#	#	BEGIN
@@ -976,28 +1034,21 @@ slave-bin.000001	#	Table_map	#	#	table_i
 slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 slave-bin.000001	#	Query	#	#	COMMIT
 slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
 slave-bin.000001	#	Query	#	#	BEGIN
 slave-bin.000001	#	Rows_query	#	#	# update t1 set a = a + 5 where b = 1 LIMIT 1
 slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 slave-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
 slave-bin.000001	#	Query	#	#	COMMIT
 slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
 slave-bin.000001	#	Query	#	#	BEGIN
 slave-bin.000001	#	Rows_query	#	#	# delete from t1 where a = 6
 slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 slave-bin.000001	#	Delete_rows	#	#	table_id: # flags: STMT_END_F
 slave-bin.000001	#	Query	#	#	COMMIT
 slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
 slave-bin.000001	#	Query	#	#	use `test`; create table t2(a int, b int) engine=innodb
 slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
+slave-bin.000001	#	Query	#	#	BEGIN
 slave-bin.000001	#	Rows_query	#	#	# insert into t2(a,b) values(2,1),(3,1)
 slave-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
 slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
@@ -1015,16 +1066,13 @@ slave-bin.000001	#	Table_map	#	#	table_i
 slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 slave-bin.000001	#	Query	#	#	COMMIT
 slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
 slave-bin.000001	#	Query	#	#	BEGIN
 slave-bin.000001	#	Rows_query	#	#	# insert into t1(a,b) values(1,7)
 slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 slave-bin.000001	#	Query	#	#	COMMIT
 slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
+slave-bin.000001	#	Query	#	#	BEGIN
 slave-bin.000001	#	Rows_query	#	#	# insert into t2(a,b) values(2,5)
 slave-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
 slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
@@ -1033,81 +1081,8 @@ slave-bin.000001	#	Table_map	#	#	table_i
 slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 slave-bin.000001	#	Xid	#	#	COMMIT /* XID */
 slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
 slave-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1`,`t2` /* generated by server */
 slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	use `test`; create table t3(a int, b int) engine= myisam
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	BEGIN
-slave-bin.000001	#	Rows_query	#	#	# insert into t3(a, b) values(1,1)
-slave-bin.000001	#	Table_map	#	#	table_id: # (test.t3)
-slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	BEGIN
-slave-bin.000001	#	Rows_query	#	#	# update t3,t4 set t3.a=3, t4.a=4 where t3.b=t4.b
-slave-bin.000001	#	Table_map	#	#	table_id: # (test.t3)
-slave-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	use `test`; FLUSH TABLES
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	BEGIN
-slave-bin.000001	#	Rows_query	#	#	# insert delayed into t3(a,b) values(1,5),(1,6),(1,7)
-slave-bin.000001	#	Table_map	#	#	table_id: # (test.t3)
-slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	BEGIN
-slave-bin.000001	#	Table_map	#	#	table_id: # (test.t3)
-slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	BEGIN
-slave-bin.000001	#	Table_map	#	#	table_id: # (test.t3)
-slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	use `test`; FLUSH TABLES t3
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	use `test`; create table t6(a VARCHAR(60)) engine= myisam
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	BEGIN
-slave-bin.000001	#	Rows_query	#	#	# load data infile '../../std_data/words.dat' into table t6
-slave-bin.000001	#	Table_map	#	#	table_id: # (test.t6)
-slave-bin.000001	#	Write_rows	#	#	table_id: #
-slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t3`,`t6` /* generated by server */
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
 slave-bin.000001	#	Query	#	#	use `test`; create table t7(a bigint) engine= myisam
 slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
 slave-bin.000001	#	Query	#	#	BEGIN
@@ -1115,24 +1090,16 @@ slave-bin.000001	#	Table_map	#	#	table_i
 slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 slave-bin.000001	#	Query	#	#	COMMIT
 slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
 slave-bin.000001	#	Query	#	#	BEGIN
 slave-bin.000001	#	Table_map	#	#	table_id: # (test.t7)
 slave-bin.000001	#	Delete_rows	#	#	table_id: # flags: STMT_END_F
 slave-bin.000001	#	Query	#	#	COMMIT
 slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
 slave-bin.000001	#	Query	#	#	BEGIN
 slave-bin.000001	#	Rows_query	#	#	# insert into t7(a) values(UUID_SHORT())
 slave-bin.000001	#	Table_map	#	#	table_id: # (test.t7)
 slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 slave-bin.000001	#	Query	#	#	COMMIT
 slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
-slave-bin.000001	#	Query	#	#	COMMIT
-slave-bin.000001	#	Gtid	#	#	SET @@SESSION.GTID_NEXT= 'GTID';
 slave-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t7` /* generated by server */
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_checksum.test'
--- a/mysql-test/suite/rpl/t/rpl_checksum.test	2011-10-28 21:22:19 +0000
+++ b/mysql-test/suite/rpl/t/rpl_checksum.test	2012-01-05 15:25:25 +0000
@@ -189,6 +189,7 @@ select count(*) as 'must be zero' from t
 connection slave;
 stop slave;
 reset slave;
+reset master;
 
 # randomize slave server's own checksum policy
 set @@global.binlog_checksum= IF(floor((rand()*1000)%2), "CRC32", "NONE");

=== modified file 'mysql-test/suite/rpl/t/rpl_row_event_max_size.test'
--- a/mysql-test/suite/rpl/t/rpl_row_event_max_size.test	2011-10-28 21:22:19 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_event_max_size.test	2012-01-05 15:59:28 +0000
@@ -10,6 +10,9 @@
 source include/master-slave.inc;
 source include/have_binlog_format_row.inc;
 
+--let $binlog_filename= query_get_value(SHOW MASTER STATUS, File, 1)
+--let $MYSQLD_DATADIR= `select @@datadir`
+
 let $binlog_start= query_get_value("SHOW MASTER STATUS", Position, 1);
 CREATE TABLE t1 (a int not null auto_increment, data1 LONGBLOB,
                  data2 LONGBLOB, PRIMARY KEY(a));
@@ -24,10 +27,15 @@ SELECT LENGTH(data1), LENGTH(data2) FROM
 
 let $old_max_allowed_packet= `SELECT @@global.max_allowed_packet`;
 SET @@global.max_allowed_packet=4194304;
-let $MYSQLD_DATADIR= `select @@datadir`;
+FLUSH LOGS;
+--let $prefix=`SELECT UUID()`
+--let $binlog_uuid_filename= $MYSQLTEST_VARDIR/tmp/$prefix-bin.log
+--copy_file $MYSQLD_DATADIR/$binlog_filename $binlog_uuid_filename
+--source include/rpl_reset.inc
+
 --echo # On master, test the added 'binlog-row-event-max-size' mysqlbinlog option
 --echo # works fine and the data is inserted by executing the dumped ROW event
---exec $MYSQL_BINLOG --binlog-row-event-max-size=2097152  --start-position=$start_pos --stop-position=$end_pos $MYSQLD_DATADIR/master-bin.000001 | $MYSQL test 2>&1
+--exec $MYSQL_BINLOG --binlog-row-event-max-size=2097152  --start-position=$start_pos --stop-position=$end_pos $binlog_uuid_filename | $MYSQL test 2>&1
 SELECT LENGTH(data1), LENGTH(data2) FROM t1 WHERE a = 1;
 eval set @@global.max_allowed_packet= $old_max_allowed_packet;
 
@@ -50,6 +58,7 @@ connection master;
 DROP TABLE t1;
 
 sync_slave_with_master;
+--source include/rpl_reset.inc
 
 --echo # Test it will cause ER_MASTER_FATAL_ERROR_READING_BINLOG when the value
 --echo # of the bigger one of max_allowed_packet and binlog_row_event_max_size
@@ -86,6 +95,8 @@ source include/wait_for_slave_io_error.i
 # clear errno
 --source include/stop_slave_sql.inc
 RESET SLAVE;
+RESET MASTER;
 
+--remove_file $binlog_uuid_filename
 --let $rpl_only_running_threads= 1
 --source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_row_ignorable_event.test'
--- a/mysql-test/suite/rpl/t/rpl_row_ignorable_event.test	2011-12-20 17:06:52 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_ignorable_event.test	2012-01-05 17:34:33 +0000
@@ -105,15 +105,23 @@ drop table t4, t5;
 --echo # SHOW BINLOG EVENTS ON MASTER before '--exec MYSQL_BINLOG'
 source include/show_binlog_events.inc;
 
---echo # MYSQL_BINLOG output base on master-bin.000001
+FLUSH LOGS;
 let $MYSQLD_DATADIR= `select @@datadir`;
+--let $prefix=`SELECT UUID()`
+--let $binlog_uuid_filename= $MYSQLTEST_VARDIR/tmp/$prefix-bin.log
+--copy_file $MYSQLD_DATADIR/$master_binlog $binlog_uuid_filename
+RESET MASTER;
+
+--echo # MYSQL_BINLOG output based on a saved copy of master-bin.000001
+
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --replace_regex /TIMESTAMP=[0-9]*/TIMESTAMP=t/ /#[0-9]*[ ]*[0-9]*:[0-9]*:[0-9]* server id [0-9]*/#server id #/ /exec_time=[0-9]*/exec_time=#/ /error_code=[0-9]*/error_code=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /Start: binlog v [0-9]*/Start: binlog v#/ /created [0-9]*[ ]*[0-9]*:[0-9]*:[0-9]* at startup/created # #:#:# at startup/ /[	 ]CRC32 0x[abcdef0-9]+// /GTID_NEXT= '.+'/GTID_NEXT= 'GTID'/
---exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLD_DATADIR/$master_binlog
+--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $binlog_uuid_filename
 
-let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1);
 --echo # Test the Rows_query log event can be applied
---exec $MYSQL_BINLOG -v -v --stop-position=$end_pos $MYSQLD_DATADIR/$master_binlog | $MYSQL test 2>&1
+--exec $MYSQL_BINLOG -v -v --stop-position=$end_pos $binlog_uuid_filename | $MYSQL test 2>&1
+
+--remove_file $binlog_uuid_filename
 
 --echo # SHOW BINLOG EVENTS ON MASTER after '--exec MYSQL_BINLOG'
 source include/show_binlog_events.inc;

=== modified file 'mysql-test/t/mysql_binary_mode.test'
--- a/mysql-test/t/mysql_binary_mode.test	2011-07-28 14:53:46 +0000
+++ b/mysql-test/t/mysql_binary_mode.test	2012-01-05 10:44:47 +0000
@@ -42,6 +42,7 @@ eval DROP TABLE `$table_name_right`;
 --echo
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
 --exec $MYSQL_BINLOG $MYSQLD_DATADIR/$binlog_file > $MYSQLTEST_VARDIR/tmp/my.sql
+RESET MASTER;
 
 --echo # '--exec mysql ...' without --binary-mode option
 --echo # It creates the table with a wrong table name and generates an error.
@@ -72,6 +73,7 @@ if (`SELECT CONVERT(@@VERSION_COMPILE_OS
 --echo
 --echo # In binary_mode, table name '0x410D0A42' and string '0x410042' can be
 --echo # handled correctly.
+RESET MASTER;
 --exec $MYSQL --binary-mode test < $MYSQLTEST_VARDIR/tmp/my.sql
 eval SELECT HEX(c1) FROM `$table_name_right`;
 
@@ -114,7 +116,12 @@ FLUSH LOGS;
 #### Replay through regular mysql client non-interactive mode
 
 --let $MYSQLD_DATADIR= `SELECT @@datadir`
---exec $MYSQL_BINLOG $MYSQLD_DATADIR/$binlog_file  | $MYSQL
+--let $prefix=`SELECT UUID()`
+--let $binlog_uuid_filename= $MYSQLTEST_VARDIR/tmp/$prefix-bin.log
+--copy_file $MYSQLD_DATADIR/$binlog_file $binlog_uuid_filename
+RESET MASTER;
+
+--exec $MYSQL_BINLOG $binlog_uuid_filename  | $MYSQL
 
 --let $table_name=`SELECT table_name FROM information_schema.tables WHERE table_schema='test'`
 --let $tbl1= `SELECT hex(table_name) FROM information_schema.tables WHERE table_schema='test'`
@@ -125,8 +132,8 @@ FLUSH LOGS;
 #### case #3: mysql --binlog-mode=1
 #### Replay through regular mysql client non-interactive mode and with binary mode set
 
---let $MYSQLD_DATADIR= `SELECT @@datadir`
---exec $MYSQL_BINLOG $MYSQLD_DATADIR/$binlog_file  | $MYSQL --binary-mode
+RESET MASTER;
+--exec $MYSQL_BINLOG $binlog_uuid_filename  | $MYSQL --binary-mode
 
 --let $table_name=`SELECT table_name FROM information_schema.tables WHERE table_schema='test'`
 --let $tbl2= `SELECT hex(table_name) FROM information_schema.tables WHERE table_schema='test'`
@@ -159,3 +166,4 @@ if (`SELECT CONVERT(@@VERSION_COMPILE_OS
 --source include/assert.inc
 
 RESET MASTER;
+--remove_file $binlog_uuid_filename

=== modified file 'mysql-test/t/mysqlbinlog_base64.test'
--- a/mysql-test/t/mysqlbinlog_base64.test	2011-05-05 22:48:15 +0000
+++ b/mysql-test/t/mysqlbinlog_base64.test	2012-01-05 10:56:37 +0000
@@ -21,14 +21,16 @@ load data infile '../../std_data/words.d
 #  Save binlog
 #
 let $MYSQLD_DATADIR=`select @@datadir`;
+let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1);
 flush logs;
---exec $MYSQL_BINLOG --hexdump $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
+--exec $MYSQL_BINLOG --hexdump $MYSQLD_DATADIR/$binlog_file > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
 
 #
 #  Clear database and restore from binlog
 #
 drop table t1;
 drop table t2;
+RESET MASTER;
 --exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
 
 #
@@ -56,8 +58,10 @@ insert into t2 select * from t2;
 insert into t2 select * from t2;
 select count(*) from t2;
 
+let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1);
 flush logs;
---exec $MYSQL_BINLOG --hexdump $MYSQLD_DATADIR/master-bin.000003 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
+--exec $MYSQL_BINLOG --hexdump $MYSQLD_DATADIR/$binlog_file > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
+RESET MASTER;
 --exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
 
 #

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl3584 branch (luis.soares:3544 to 3545) Luis Soares9 Jan