From 13c679124f2f0e6ebe23aa0cd484e1bcc4896619 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 27 Jul 2007 14:28:36 +0300 Subject: [PATCH] 5.0-opt -> 5.1-opt merge of the test case for bug 29571: - reset the logs before and after the test. - cleanup from the previous tests : use the correct schema. mysql-test/extra/rpl_tests/rpl_insert_delayed.test: 5.0-opt -> 5.1-opt merge of the test case for bug 29571. mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result: 5.0-opt -> 5.1-opt merge of the test case for bug 29571. --- .../extra/rpl_tests/rpl_insert_delayed.test | 15 +++++- .../suite/rpl/r/rpl_stm_insert_delayed.result | 52 +++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/mysql-test/extra/rpl_tests/rpl_insert_delayed.test b/mysql-test/extra/rpl_tests/rpl_insert_delayed.test index 9364bcbec48..1dc14748688 100644 --- a/mysql-test/extra/rpl_tests/rpl_insert_delayed.test +++ b/mysql-test/extra/rpl_tests/rpl_insert_delayed.test @@ -83,12 +83,19 @@ connection master; USE test; DROP SCHEMA mysqlslap; sync_slave_with_master; +use test; 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; + CREATE TABLE t1(a int, UNIQUE(a)); INSERT DELAYED IGNORE INTO t1 VALUES(1); INSERT DELAYED IGNORE INTO t1 VALUES(1); @@ -96,14 +103,14 @@ 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 limit 11,100; +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 limit 12,100; +show binlog events in 'slave-bin.000002' LIMIT 2,2; select * from t1; @@ -111,6 +118,10 @@ select * from t1; connection master; drop table t1; sync_slave_with_master; +#flush the logs after the test +FLUSH LOGS; connection master; +FLUSH LOGS; + --echo End of 5.0 tests diff --git a/mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result b/mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result index 1c003856eb9..5ca0ea2b780 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result +++ b/mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result @@ -45,6 +45,32 @@ id name 20 is Bond 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 use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1) +x x x x x use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1) +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 use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1) +x x x x x use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1) +select * from t1; +a +1 +drop table t1; +FLUSH LOGS; +FLUSH LOGS; +End of 5.0 tests set @@global.binlog_format = mixed; CREATE SCHEMA IF NOT EXISTS mysqlslap; USE mysqlslap; @@ -85,4 +111,30 @@ id name 20 is Bond 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 use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1) +x x x x x use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1) +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 use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1) +x x x x x use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1) +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;