Commit ca25d07e authored by unknown's avatar unknown
Browse files

Use replace_regex to mask the output of file_id= in "show binlog events" that... 

Use replace_regex to mask the output of file_id= in "show binlog events" that depends on previous tests
What is this? replace_regex in 4.1! :)


mysql-test/r/rpl_charset.result:
  Use replace_regex to mask the output of file_id= in "show binlog events" that depends on previous tests
mysql-test/t/rpl_charset.test:
  Use replace_regex to mask the output of file_id= in "show binlog events" that depends on previous tests
parent fe8d349a

mysql-test/r/rpl_charset.result

+2 −2
Original line number Diff line number Diff line
@@ -147,10 +147,10 @@ master-bin.000001 3577 Intvar 1 3577 INSERT_ID=4 
master-bin.000001	3605	Query	1	3605	use `mysqltest2`; insert into t1 (b) values(LEAST("Müller","Muffler"))

master-bin.000001	3698	Query	1	3698	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	3839	Intvar	1	3839	INSERT_ID=74

master-bin.000001	3867	Create_file	1	3867	db=mysqltest2;table=t1;file_id=1;block_len=581

master-bin.000001	3867	Create_file	1	3867	db=mysqltest2;table=t1;file_id=x;block_len=581

master-bin.000001	4540	Query	1	4540	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	4681	Intvar	1	4681	INSERT_ID=5

master-bin.000001	4709	Exec_load	1	4709	;file_id=1

master-bin.000001	4709	Exec_load	1	4709	;file_id=x

master-bin.000001	4732	Query	1	4732	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

master-bin.000001	4873	Query	1	4873	use `mysqltest2`; truncate table t1

master-bin.000001	4931	Query	1	4931	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64

mysql-test/t/rpl_charset.test

+2 −0
Original line number Diff line number Diff line
@@ -106,6 +106,8 @@ select * from mysqltest2.t1 order by a; 
connection master;

drop database mysqltest2;

drop database mysqltest3;

# file_id: xx can vary depending on previous tests

--replace_regex /file_id=[0-9]/file_id=x/

show binlog events from 79;

sync_slave_with_master;