Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

mysql-test/r/binlog.result

@@ -17,7 +17,7 @@ master-bin.000001	#	Query	1	#	use `test`; insert t1 values (5)
 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=12 */
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=13 */
 drop table t1,t2;
 reset master;
 create table t1 (n int) engine=innodb;
@@ -128,7 +128,7 @@ master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(4 + 4)
 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=19 */
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=20 */
 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

mysql-test/t/binlog.test

@@ -20,7 +20,7 @@ begin;
 insert t2 values (5);
 commit;
 # first COMMIT must be Query_log_event, second - Xid_log_event
---replace_result "xid=21" "xid=12"
+--replace_result "xid=22" "xid=13"
 --replace_column 2 # 5 #
 show binlog events from 98;
 drop table t1,t2;
@@ -42,7 +42,7 @@ while ($1)
 --enable_query_log
 commit;
 drop table t1;
---replace_result "xid=32" "xid=19"
+--replace_result "xid=33" "xid=20"
 --replace_column 2 # 5 #
 show binlog events in 'master-bin.000001' from 98;
 --replace_column 2 # 5 #