Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1

into  mysql.com:/usr/home/ram/work/mysql-5.1

mysql-test/extra/rpl_tests/rpl_log.test

@@ -142,6 +142,7 @@ set insert_id=5;
 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;

mysql-test/r/rpl_ndb_log.result

@@ -140,8 +140,8 @@ insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
 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

mysql-test/r/rpl_row_log.result

@@ -108,8 +108,8 @@ insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
 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

mysql-test/r/rpl_row_log_innodb.result

@@ -116,8 +116,8 @@ insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
 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