=== modified file 'mysql-test/r/alter_table-big.result' --- mysql-test/r/alter_table-big.result 2007-05-19 06:49:56 +0000 +++ mysql-test/r/alter_table-big.result 2009-12-16 10:01:36 +0000 @@ -12,7 +12,7 @@ alter table t1 enable keys;; insert into t2 values (1); insert into t1 values (1, 1, 1); set session debug="-d,sleep_alter_enable_indexes"; -show binlog events in 'master-bin.000001' from 106; +show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query 1 # use `test`; insert into t2 values (1) master-bin.000001 # Query 1 # use `test`; alter table t1 enable keys @@ -41,7 +41,7 @@ alter table t2 change c vc varchar(100) rename table t1 to t3; drop table t3; set session debug="-d,sleep_alter_before_main_binlog"; -show binlog events in 'master-bin.000001' from 106; +show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query 1 # use `test`; alter table t1 change i c char(10) default 'Test1' master-bin.000001 # Query 1 # use `test`; insert into t1 values () === modified file 'mysql-test/r/create-big.result' --- mysql-test/r/create-big.result 2007-05-23 11:26:16 +0000 +++ mysql-test/r/create-big.result 2009-12-16 10:01:36 +0000 @@ -175,10 +175,10 @@ t2 CREATE TABLE `t2` ( `i` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t2; -show binlog events in 'master-bin.000001' from 106; +show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query 1 # use `test`; insert into t1 values (1) master-bin.000001 # Query 1 # use `test`; create table t2 like t1 +master-bin.000001 # Query 1 # use `test`; insert into t1 values (1) master-bin.000001 # Query 1 # use `test`; drop table t1 master-bin.000001 # Query 1 # use `test`; drop table t2 create table t1 (i int); @@ -197,7 +197,7 @@ reset master; create table t2 like t1;; drop table t1; drop table t2; -show binlog events in 'master-bin.000001' from 106; +show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query 1 # use `test`; create table t2 like t1 master-bin.000001 # Query 1 # use `test`; drop table t1 @@ -213,7 +213,7 @@ drop table t2; create table t2 like t1;; drop table t1; drop table t2; -show binlog events in 'master-bin.000001' from 106; +show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query 1 # use `test`; create table t2 like t1 master-bin.000001 # Query 1 # use `test`; insert into t2 values (1) @@ -234,7 +234,7 @@ drop table t2; create table t2 like t1;; drop table t1; drop table t2; -show binlog events in 'master-bin.000001' from 106; +show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query 1 # use `test`; create table t2 like t1 master-bin.000001 # Query 1 # use `test`; insert into t2 values (1) === modified file 'mysql-test/t/alter_table-big.test' --- mysql-test/t/alter_table-big.test 2009-03-06 14:56:17 +0000 +++ mysql-test/t/alter_table-big.test 2009-12-16 10:01:36 +0000 @@ -50,8 +50,7 @@ connection default; --reap set session debug="-d,sleep_alter_enable_indexes"; # Check that statements were executed/binlogged in correct order. ---replace_column 2 # 5 # -show binlog events in 'master-bin.000001' from 106; +--source include/show_binlog_events2.inc # Clean up drop tables t1, t2; @@ -111,8 +110,7 @@ drop table t3; set session debug="-d,sleep_alter_before_main_binlog"; # Check that all statements were logged in correct order ---replace_column 2 # 5 # -show binlog events in 'master-bin.000001' from 106; +--source include/show_binlog_events2.inc --echo End of 5.1 tests === modified file 'mysql-test/t/create-big.test' --- mysql-test/t/create-big.test 2007-05-23 11:26:16 +0000 +++ mysql-test/t/create-big.test 2009-12-16 10:01:36 +0000 @@ -305,8 +305,7 @@ connection default; show create table t2; drop table t2; # Let us check that statements were executed/binlogged in correct order ---replace_column 2 # 5 # -show binlog events in 'master-bin.000001' from 106; +--source include/show_binlog_events2.inc # Now let us check the gap between check for target table # existance and copying of .frm file. @@ -330,8 +329,7 @@ drop table t1; connection default; --reap drop table t2; ---replace_column 2 # 5 # -show binlog events in 'master-bin.000001' from 106; +--source include/show_binlog_events2.inc # And now he gap between copying of .frm file and ha_create_table() call. create table t1 (i int); @@ -359,8 +357,7 @@ drop table t1; connection default; --reap drop table t2; ---replace_column 2 # 5 # -show binlog events in 'master-bin.000001' from 106; +--source include/show_binlog_events2.inc # Finally we check the gap between ha_create_table() and binlogging create table t1 (i int); @@ -386,7 +383,6 @@ drop table t1; connection default; --reap drop table t2; ---replace_column 2 # 5 # -show binlog events in 'master-bin.000001' from 106; +--source include/show_binlog_events2.inc set session debug="-d,sleep_create_like_before_binlogging";