bk commit into 5.1 tree (monty:1.2224)

[monty]

Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty 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.2224 06/06/21 18:27:45 monty@stripped +4 -0
  Change table_id's to # to make tests portable

  mysql-test/r/rpl_row_log_innodb.result
    1.10 06/06/21 18:27:41 monty@stripped +2 -2
    Update test result to use table_id: #

  mysql-test/r/rpl_row_log.result
    1.10 06/06/21 18:27:41 monty@stripped +2 -2
    Update test result to use table_id: #

  mysql-test/r/rpl_ndb_log.result
    1.12 06/06/21 18:27:41 monty@stripped +2 -2
    Update test result to use table_id: #

  mysql-test/extra/rpl_tests/rpl_log.test
    1.40 06/06/21 18:27:41 monty@stripped +1 -0
    Change table_id's to # to make test portable

# 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:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.1

--- 1.11/mysql-test/r/rpl_ndb_log.result	2006-06-20 23:44:09 +03:00
+++ 1.12/mysql-test/r/rpl_ndb_log.result	2006-06-21 18:27:41 +03:00
@@ -140,8 +140,8 @@
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000001	#	Table_map	2	#	table_id: 30 (test.t1)
-slave-bin.000001	#	Write_rows	2	#	table_id: 30 flags: STMT_END_F
+slave-bin.000001	#	Table_map	2	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	2	#	table_id: # flags: STMT_END_F
 select * from t1;
 a	b
 1	1

--- 1.9/mysql-test/r/rpl_row_log_innodb.result	2006-06-19 19:16:33 +03:00
+++ 1.10/mysql-test/r/rpl_row_log_innodb.result	2006-06-21 18:27:41 +03:00
@@ -116,8 +116,8 @@
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000001	#	Table_map	2	#	table_id: 21 (test.t1)
-slave-bin.000001	#	Write_rows	2	#	table_id: 21 flags: STMT_END_F
+slave-bin.000001	#	Table_map	2	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	2	#	table_id: # flags: STMT_END_F
 select * from t1;
 a	b
 1	1

--- 1.9/mysql-test/r/rpl_row_log.result	2006-06-19 19:17:11 +03:00
+++ 1.10/mysql-test/r/rpl_row_log.result	2006-06-21 18:27:41 +03:00
@@ -108,8 +108,8 @@
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000001	#	Table_map	2	#	table_id: 21 (test.t1)
-slave-bin.000001	#	Write_rows	2	#	table_id: 21 flags: STMT_END_F
+slave-bin.000001	#	Table_map	2	#	table_id: # (test.t1)
+slave-bin.000001	#	Write_rows	2	#	table_id: # flags: STMT_END_F
 select * from t1;
 a	b
 1	1

--- 1.39/mysql-test/extra/rpl_tests/rpl_log.test	2006-06-19 03:00:03 +03:00
+++ 1.40/mysql-test/extra/rpl_tests/rpl_log.test	2006-06-21 18:27:41 +03:00
@@ -142,6 +142,7 @@
 insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
 --replace_result $VERSION VERSION
 --replace_column 2 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
 show binlog events;
 select * from t1;
 drop table t1;