bk commit into 5.1 tree (mkindahl:1.2655)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl. When mkindahl 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, 2008-01-29 14:43:41+01:00, mkindahl@stripped +7 -0
  Test changes to fix failures in pushbuild.

  mysql-test/include/show_binlog_events.inc@stripped, 2008-01-29 14:43:03+01:00,
mkindahl@stripped +1 -1
    Replacing file_id=N with file_id=# to avoid result mismatches

  mysql-test/suite/binlog/r/binlog_killed_simulate.result@stripped, 2008-01-29 14:43:08+01:00,
mkindahl@stripped +2 -2
    Result change

  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result@stripped, 2008-01-29
14:43:09+01:00, mkindahl@stripped +2 -2
    Result change

  mysql-test/suite/binlog/r/binlog_stm_blackhole.result@stripped, 2008-01-29 14:43:14+01:00,
mkindahl@stripped +2 -2
    Result change

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@stripped, 2008-01-29
14:43:20+01:00, mkindahl@stripped +4 -4
    Result change

  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test@stripped, 2008-01-29
14:43:20+01:00, mkindahl@stripped +1 -1
    Binlog positions differ between mixed and statement based replication.

  mysql-test/suite/rpl/r/rpl_stm_log.result@stripped, 2008-01-29 14:43:25+01:00,
mkindahl@stripped +2 -2
    Result change

diff -Nrup a/mysql-test/include/show_binlog_events.inc
b/mysql-test/include/show_binlog_events.inc
--- a/mysql-test/include/show_binlog_events.inc	2007-04-18 23:08:53 +02:00
+++ b/mysql-test/include/show_binlog_events.inc	2008-01-29 14:43:03 +01:00
@@ -1,5 +1,5 @@
 --let $binlog_start=106
 --replace_result $binlog_start <binlog_start>
 --replace_column 2 # 4 # 5 #
---replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
/file_id=[0-9]+/file_id=#/
 --eval show binlog events from $binlog_start
diff -Nrup a/mysql-test/suite/binlog/r/binlog_killed_simulate.result
b/mysql-test/suite/binlog/r/binlog_killed_simulate.result
--- a/mysql-test/suite/binlog/r/binlog_killed_simulate.result	2007-10-31 10:48:43 +01:00
+++ b/mysql-test/suite/binlog/r/binlog_killed_simulate.result	2008-01-29 14:43:08 +01:00
@@ -18,8 +18,8 @@ load data infile '../std_data_ln/rpl_loa
 ERROR 70100: Query execution was interrupted
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Begin_load_query	#	#	;file_id=1;block_len=12
-master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile
'../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */
;file_id=1
+master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=12
+master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile
'../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */
;file_id=#
 select
 (@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
 is not null;
diff -Nrup a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
--- a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result	2008-01-11 13:27:43
+01:00
+++ b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result	2008-01-29 14:43:09
+01:00
@@ -873,10 +873,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
 master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=10
 master-bin.000001	#	User var	#	#	@`b`=_latin1 0x3135 COLLATE latin1_swedish_ci
-master-bin.000001	#	Begin_load_query	#	#	;file_id=1;block_len=12
+master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=12
 master-bin.000001	#	Intvar	#	#	INSERT_ID=10
 master-bin.000001	#	User var	#	#	@`b`=_latin1 0x3135 COLLATE latin1_swedish_ci
-master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile
'../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2)
;file_id=1
+master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile
'../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2)
;file_id=#
 master-bin.000001	#	Query	#	#	use `test`; ROLLBACK
 drop trigger trg_del_t2;
 drop table t1,t2,t3,t4,t5;
diff -Nrup a/mysql-test/suite/binlog/r/binlog_stm_blackhole.result
b/mysql-test/suite/binlog/r/binlog_stm_blackhole.result
--- a/mysql-test/suite/binlog/r/binlog_stm_blackhole.result	2007-12-19 15:05:21 +01:00
+++ b/mysql-test/suite/binlog/r/binlog_stm_blackhole.result	2008-01-29 14:43:14 +01:00
@@ -125,8 +125,8 @@ master-bin.000001	#	Query	#	#	use `test`
 master-bin.000001	#	Query	#	#	use `test`; COMMIT
 master-bin.000001	#	Query	#	#	use `test`; create table t2 (a varchar(200))
engine=blackhole
 master-bin.000001	#	Query	#	#	use `test`; BEGIN
-master-bin.000001	#	Begin_load_query	#	#	;file_id=1;block_len=581
-master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile
'../std_data_ln/words.dat' into table t2 ;file_id=1
+master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=581
+master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile
'../std_data_ln/words.dat' into table t2 ;file_id=#
 master-bin.000001	#	Query	#	#	use `test`; COMMIT
 master-bin.000001	#	Query	#	#	use `test`; alter table t1 add b int
 master-bin.000001	#	Query	#	#	use `test`; alter table t1 drop b
diff -Nrup a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
--- a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result	2008-01-11 13:27:43
+01:00
+++ b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result	2008-01-29 14:43:20
+01:00
@@ -474,7 +474,7 @@ insert into t2 values (bug27417(2));
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	222		
+master-bin.000001	232		
 /* only (!) with fixes for #23333 will show there is the query */;
 select count(*) from t1 /* must be 3 */;
 count(*)
@@ -489,7 +489,7 @@ count(*)
 2
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	227		
+master-bin.000001	231		
 /* the query must be in regardless of #23333 */;
 select count(*) from t1 /* must be 5 */;
 count(*)
@@ -855,10 +855,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
 master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=10
 master-bin.000001	#	User var	#	#	@`b`=_latin1 0x3135 COLLATE latin1_swedish_ci
-master-bin.000001	#	Begin_load_query	#	#	;file_id=2;block_len=12
+master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=12
 master-bin.000001	#	Intvar	#	#	INSERT_ID=10
 master-bin.000001	#	User var	#	#	@`b`=_latin1 0x3135 COLLATE latin1_swedish_ci
-master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile
'../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2)
;file_id=2
+master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile
'../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2)
;file_id=#
 master-bin.000001	#	Query	#	#	use `test`; ROLLBACK
 drop trigger trg_del_t2;
 drop table t1,t2,t3,t4,t5;
diff -Nrup a/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test
b/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test
--- a/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test	2008-01-11 13:27:43
+01:00
+++ b/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test	2008-01-29 14:43:20
+01:00
@@ -1,7 +1,7 @@
 # This is a wrapper for binlog.test so that the same test case can be used 
 # For both statement and row based bin logs 9/19/2005 [jbm]
 
--- source include/have_binlog_format_mixed_or_statement.inc
+-- source include/have_binlog_format_statement.inc
 -- source extra/binlog_tests/mix_innodb_myisam_binlog.test
 
 set @@session.binlog_format=statement;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_stm_log.result
b/mysql-test/suite/rpl/r/rpl_stm_log.result
--- a/mysql-test/suite/rpl/r/rpl_stm_log.result	2007-08-21 14:33:02 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_stm_log.result	2008-01-29 14:43:25 +01:00
@@ -196,8 +196,8 @@ master-bin.000001	#	Intvar	#	#	INSERT_ID
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (NULL)
 master-bin.000001	#	Query	#	#	use `test`; drop table t1
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (word char(20) not
null)ENGINE=MyISAM
-master-bin.000001	#	Begin_load_query	#	#	;file_id=1;block_len=581
-master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile
'../std_data_ln/words.dat' into table t1 ignore 1 lines ;file_id=1
+master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=581
+master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile
'../std_data_ln/words.dat' into table t1 ignore 1 lines ;file_id=#
 master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002';
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info