bk commit into 5.0 tree (tsmith:1.2484)

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tsmith. When tsmith 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@stripped, 2007-06-15 23:57:53+02:00, tsmith@stripped +2 -0
  binlog.result, binlog.test:
    Post-merge fix: replace xid=* with XID to isolate from number of transactions

  mysql-test/r/binlog.result@stripped, 2007-06-15 23:57:23+02:00, tsmith@stripped +2 -2
    Post-merge fix: replace xid=* with XID to isolate from number of transactions

  mysql-test/t/binlog.test@stripped, 2007-06-15 23:57:23+02:00, tsmith@stripped +2 -2
    Post-merge fix: replace xid=* with XID to isolate from number of transactions

# 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:	tsmith
# Host:	quadxeon.mysql.com
# Root:	/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50

--- 1.8/mysql-test/r/binlog.result	2007-06-14 22:58:21 +02:00
+++ 1.9/mysql-test/r/binlog.result	2007-06-15 23:57:23 +02:00
@@ -17,7 +17,7 @@ master-bin.000001	#	Query	1	#	use `test`
 master-bin.000001	#	Query	1	#	use `test`; COMMIT
 master-bin.000001	#	Query	1	#	use `test`; BEGIN
 master-bin.000001	#	Query	1	#	use `test`; insert t2 values (5)
-master-bin.000001	#	Xid	1	#	COMMIT /* xid=13 */
+master-bin.000001	#	Xid	1	#	COMMIT /* XID */
 drop table t1,t2;
 reset master;
 create table t1 (n int) engine=innodb;
@@ -128,7 +128,7 @@ master-bin.000001	#	Query	1	#	use `test`
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(3 + 4)
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(2 + 4)
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(1 + 4)
-master-bin.000001	#	Xid	1	#	COMMIT /* xid=20 */
+master-bin.000001	#	Xid	1	#	COMMIT /* XID */
 master-bin.000001	#	Rotate	1	#	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002' from 98;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info

--- 1.10/mysql-test/t/binlog.test	2007-06-14 22:58:22 +02:00
+++ 1.11/mysql-test/t/binlog.test	2007-06-15 23:57:23 +02:00
@@ -21,8 +21,8 @@ begin;
 insert t2 values (5);
 commit;
 # first COMMIT must be Query_log_event, second - Xid_log_event
---replace_result "xid=22" "xid=13"
 --replace_column 2 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
 show binlog events from 98;
 drop table t1,t2;
 
@@ -43,8 +43,8 @@ while ($1)
 --enable_query_log
 commit;
 drop table t1;
---replace_result "xid=33" "xid=20"
 --replace_column 2 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
 show binlog events in 'master-bin.000001' from 98;
 --replace_column 2 # 5 #
 show binlog events in 'master-bin.000002' from 98;