From a300bd534b14995398cd04f1e6f26f539fa60a83 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 21 Jan 2008 22:31:31 +0800 Subject: [PATCH] fix failed tests mysql-test/extra/binlog_tests/blackhole.test: mask out file_id mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test: remove unnecessary show master status mysql-test/suite/binlog/r/binlog_stm_blackhole.result: mask out file_id mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: remove unnecessary show master status --- mysql-test/extra/binlog_tests/blackhole.test | 15 +++++++++++++-- .../mix_innodb_myisam_side_effects.test | 4 ---- .../suite/binlog/r/binlog_stm_blackhole.result | 10 ++++++---- .../binlog/r/binlog_stm_mix_innodb_myisam.result | 12 ------------ 4 files changed, 19 insertions(+), 22 deletions(-) diff --git a/mysql-test/extra/binlog_tests/blackhole.test b/mysql-test/extra/binlog_tests/blackhole.test index 8407fd939b5..085882bcdd1 100644 --- a/mysql-test/extra/binlog_tests/blackhole.test +++ b/mysql-test/extra/binlog_tests/blackhole.test @@ -126,8 +126,12 @@ select * from t2; select * from t3; let $VERSION=`select version()`; +--replace_result $VERSION VERSION +--replace_column 2 # 4 # 5 # +--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ --replace_regex /file_id=[0-9]+/file_id=#/ -source include/show_binlog_events.inc; +show binlog events; + drop table t1,t2,t3; # @@ -170,7 +174,14 @@ start transaction; insert into t1 values(2); rollback; set autocommit=1; -source include/show_binlog_events.inc; + +let $VERSION=`select version()`; +--replace_result $VERSION VERSION +--replace_column 2 # 4 # 5 # +--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ +--replace_regex /file_id=[0-9]+/file_id=#/ +show binlog events; + drop table if exists t1; # End of 5.1 tests diff --git a/mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test b/mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test index 03514bfdb55..0a0bef4ca4d 100644 --- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test +++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test @@ -18,7 +18,6 @@ create temporary table tt (a int unique); create table ti (a int) engine=innodb; reset master; -show master status; # action @@ -31,7 +30,6 @@ rollback; # check select count(*) from tt /* 2 */; -show master status; source include/show_binlog_events.inc; select count(*) from ti /* zero */; insert into ti select * from tt; @@ -42,7 +40,6 @@ select * from ti /* that is what slave would miss - bug#28960 */; delete from ti; delete from tt where a=1; reset master; -show master status; # action @@ -55,7 +52,6 @@ rollback; # check -show master status; source include/show_binlog_events.inc; # nothing in binlog with row bilog format select count(*) from ti /* zero */; insert into ti select * from tt; diff --git a/mysql-test/suite/binlog/r/binlog_stm_blackhole.result b/mysql-test/suite/binlog/r/binlog_stm_blackhole.result index 88140593046..7352e9b990d 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_blackhole.result +++ b/mysql-test/suite/binlog/r/binlog_stm_blackhole.result @@ -104,8 +104,9 @@ select * from t2; a select * from t3; a -show binlog events from ; +show binlog events; Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Format_desc # # Server ver: VERSION, Binlog ver: 4 master-bin.000001 # Query # # use `test`; drop table t1,t2 master-bin.000001 # Query # # use `test`; create table t1 (a int) engine=blackhole master-bin.000001 # Query # # use `test`; BEGIN @@ -125,8 +126,8 @@ master-bin.000001 # Query # # use `test`; replace into t1 values(100) 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 @@ -162,8 +163,9 @@ start transaction; insert into t1 values(2); rollback; set autocommit=1; -show binlog events from ; +show binlog events; Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Format_desc # # Server ver: VERSION, Binlog ver: 4 master-bin.000001 # Query # # use `test`; create table t1 (a int) engine=blackhole master-bin.000001 # Query # # use `test`; BEGIN master-bin.000001 # Query # # use `test`; insert into t1 values(1) diff --git a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result index 20f2eaac535..cdf7363b062 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result @@ -619,9 +619,6 @@ set @@session.binlog_format=statement; create temporary table tt (a int unique); create table ti (a int) engine=innodb; reset master; -show master status; -File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 106 begin; insert into ti values (1); insert into ti values (2) ; @@ -632,9 +629,6 @@ Warning 1196 Some non-transactional changed tables couldn't be rolled back select count(*) from tt /* 2 */; count(*) 2 -show master status; -File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 515 show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; BEGIN @@ -653,9 +647,6 @@ a delete from ti; delete from tt where a=1; reset master; -show master status; -File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 106 begin; insert into ti values (1); insert into ti values (2) /* to make the dup error in the following */; @@ -664,9 +655,6 @@ ERROR 23000: Duplicate entry '2' for key 'a' rollback; Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back -show master status; -File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 589 show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; BEGIN