bk commit into 5.1 tree (gbichot:1.2179) BUG#18108

[guilhem]

Below is the list of changes that have just been committed into a local
5.1 repository of gbichot. When gbichot does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2179 06/03/14 14:21:28 gbichot@stripped +3 -0
  Re-enabling rpl_rbr_to_sbr.test as BUG#18108 was fixed
  (nothing to document, this bug was not released).
  

  mysql-test/r/rpl_rbr_to_sbr.result
    1.2 06/03/14 14:05:10 gbichot@stripped +11 -11
    result update

  mysql-test/t/rpl_rbr_to_sbr.test
    1.2 06/03/14 14:04:45 gbichot@stripped +7 -0
    making test portable

  mysql-test/t/disabled.def
    1.101 06/03/14 14:04:23 gbichot@stripped +0 -1
    bug is fixed, enabling test case

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gbichot
# Host:	production.mysql.com
# Root:	/usersnfs/gbichot/mysql-5.1-new

--- 1.100/mysql-test/t/disabled.def	2006-03-13 09:55:32 +01:00
+++ 1.101/mysql-test/t/disabled.def	2006-03-14 14:04:23 +01:00
@@ -43,5 +43,4 @@
 rpl_sp                  : Bug#16456
 rpl_until               : Unstable test case, bug#15886
 sp-goto                 : GOTO is currently is disabled - will be fixed in the future
-rpl_rbr_to_sbr          : BUG#18108
 mysqldump               : BUG#18078

--- 1.1/mysql-test/r/rpl_rbr_to_sbr.result	2006-03-08 06:55:11 +01:00
+++ 1.2/mysql-test/r/rpl_rbr_to_sbr.result	2006-03-14 14:05:10 +01:00
@@ -18,11 +18,11 @@
 INSERT INTO t1 VALUES (3,UUID()), (4,UUID());
 SHOW BINLOG EVENTS;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	102	Server ver: 5.1.8-beta-debug-log, Binlog ver: 4
-master-bin.000001	102	Query	1	196	use `test`; CREATE TABLE t1 (a INT, b LONG)
-master-bin.000001	196	Query	1	293	use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
-master-bin.000001	293	Table_map	1	333	test.t1
-master-bin.000001	333	Write_rows	1	450	
+master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE t1 (a INT, b LONG)
+master-bin.000001	#	Query	1	#	use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
+master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 **** On Slave ****
 SHOW SLAVE STATUS;
 Slave_IO_State	#
@@ -60,10 +60,10 @@
 Seconds_Behind_Master	#
 SHOW BINLOG EVENTS;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	4	Format_desc	2	102	Server ver: 5.1.8-beta-debug-log, Binlog ver: 4
-slave-bin.000001	102	Query	2	212	use `test`; drop table if exists
t1,t2,t3,t4,t5,t6,t7,t8,t9
-slave-bin.000001	212	Query	1	306	use `test`; CREATE TABLE t1 (a INT, b LONG)
-slave-bin.000001	306	Query	1	403	use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
-slave-bin.000001	403	Table_map	1	443	test.t1
-slave-bin.000001	443	Write_rows	1	560	
+slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
+slave-bin.000001	#	Query	2	#	use `test`; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9
+slave-bin.000001	#	Query	1	#	use `test`; CREATE TABLE t1 (a INT, b LONG)
+slave-bin.000001	#	Query	1	#	use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
+slave-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 DROP TABLE IF EXISTS t1;

--- 1.1/mysql-test/t/rpl_rbr_to_sbr.test	2006-03-08 06:55:12 +01:00
+++ 1.2/mysql-test/t/rpl_rbr_to_sbr.test	2006-03-14 14:04:45 +01:00
@@ -13,12 +13,19 @@
 CREATE TABLE t1 (a INT, b LONG);
 INSERT INTO t1 VALUES (1,1), (2,2);
 INSERT INTO t1 VALUES (3,UUID()), (4,UUID());
+let $VERSION=`select version()`;
+--replace_result $VERSION VERSION
+--replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 SHOW BINLOG EVENTS;
 sync_slave_with_master;
 --echo **** On Slave ****
 --replace_result $MASTER_MYPORT MASTER_PORT
 --replace_column 1 # 8 # 9 # 23 # 33 #
 --query_vertical SHOW SLAVE STATUS
+--replace_result $VERSION VERSION
+--replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 SHOW BINLOG EVENTS;
 
 --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info
test > $MYSQLTEST_VARDIR/tmp/rpl_rbr_to_sbr_master.sql