diff --git a/mysql-test/extra/rpl_tests/rpl_insert_delayed.test b/mysql-test/extra/rpl_tests/rpl_insert_delayed.test index 1dc14748688..e492903afad 100644 --- a/mysql-test/extra/rpl_tests/rpl_insert_delayed.test +++ b/mysql-test/extra/rpl_tests/rpl_insert_delayed.test @@ -90,27 +90,36 @@ connection master; # Bug #29571: INSERT DELAYED IGNORE written to binary log on the master but # on the slave # -#flush the logs before the test -connection slave; -FLUSH LOGS; -connection master; -FLUSH LOGS; +if (`SELECT @@global.binlog_format != 'ROW'`) +{ + #flush the logs before the test + connection slave; + FLUSH LOGS; + connection master; + FLUSH LOGS; +} CREATE TABLE t1(a int, UNIQUE(a)); INSERT DELAYED IGNORE INTO t1 VALUES(1); INSERT DELAYED IGNORE INTO t1 VALUES(1); flush table t1; # to wait for INSERT DELAYED to be done -#must show two INSERT DELAYED ---replace_column 1 x 2 x 3 x 4 x 5 x -show binlog events in 'master-bin.000002' LIMIT 2,2; +if (`SELECT @@global.binlog_format != 'ROW'`) +{ + #must show two INSERT DELAYED + --replace_column 1 x 2 x 3 x 4 x 5 x + show binlog events in 'master-bin.000002' LIMIT 2,2; +} select * from t1; sync_slave_with_master; echo On slave; -#must show two INSERT DELAYED ---replace_column 1 x 2 x 3 x 4 x 5 x -show binlog events in 'slave-bin.000002' LIMIT 2,2; +if (`SELECT @@global.binlog_format != 'ROW'`) +{ + #must show two INSERT DELAYED + --replace_column 1 x 2 x 3 x 4 x 5 x + show binlog events in 'slave-bin.000002' LIMIT 2,2; +} select * from t1; @@ -118,10 +127,14 @@ select * from t1; connection master; drop table t1; sync_slave_with_master; -#flush the logs after the test -FLUSH LOGS; +if (`SELECT @@global.binlog_format != 'ROW'`) +{ + #flush the logs after the test + FLUSH LOGS; + connection master; + FLUSH LOGS; +} connection master; -FLUSH LOGS; --echo End of 5.0 tests diff --git a/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result b/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result index 87b375bf653..1551d83266d 100644 --- a/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result +++ b/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result @@ -46,29 +46,17 @@ id name USE test; DROP SCHEMA mysqlslap; use test; -FLUSH LOGS; -FLUSH LOGS; CREATE TABLE t1(a int, UNIQUE(a)); INSERT DELAYED IGNORE INTO t1 VALUES(1); INSERT DELAYED IGNORE INTO t1 VALUES(1); flush table t1; -show binlog events in 'master-bin.000002' LIMIT 2,2; -Log_name Pos Event_type Server_id End_log_pos Info -x x x x x table_id: 23 (test.t1) -x x x x x table_id: 23 flags: STMT_END_F select * from t1; a 1 On slave -show binlog events in 'slave-bin.000002' LIMIT 2,2; -Log_name Pos Event_type Server_id End_log_pos Info -x x x x x table_id: 23 (test.t1) -x x x x x table_id: 23 flags: STMT_END_F select * from t1; a 1 drop table t1; -FLUSH LOGS; -FLUSH LOGS; End of 5.0 tests set @@global.binlog_format = @old_global_binlog_format;