diff options
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/suite/binlog/t/binlog_index.test | 6 | ||||
-rw-r--r-- | mysql-test/suite/rpl/t/rpl_checksum.test | 1 | ||||
-rw-r--r-- | mysql-test/suite/rpl/t/rpl_rotate_logs.test | 1 | ||||
-rw-r--r-- | mysql-test/t/mysqlbinlog.test | 1 |
4 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/suite/binlog/t/binlog_index.test b/mysql-test/suite/binlog/t/binlog_index.test index a264549ce17..26f3595db2b 100644 --- a/mysql-test/suite/binlog/t/binlog_index.test +++ b/mysql-test/suite/binlog/t/binlog_index.test @@ -37,6 +37,7 @@ flush tables; # there must be a warning with file names replace_regex /\.[\\\/]master/master/; +--source include/wait_for_binlog_checkpoint.inc purge binary logs TO 'master-bin.000004'; --echo *** must show a list starting from the 'TO' argument of PURGE *** @@ -57,6 +58,7 @@ remove_file $MYSQLD_DATADIR/master-bin.000001; let $date=`select NOW() + INTERVAL 1 MINUTE`; --disable_query_log replace_regex /\.[\\\/]master/master/; +--source include/wait_for_binlog_checkpoint.inc eval purge binary logs BEFORE '$date'; --enable_query_log @@ -77,6 +79,7 @@ flush logs; remove_file $MYSQLD_DATADIR/master-bin.000001; mkdir $MYSQLD_DATADIR/master-bin.000001; +--source include/wait_for_binlog_checkpoint.inc --error ER_BINLOG_PURGE_FATAL_ERR purge binary logs TO 'master-bin.000002'; replace_regex /\.[\\\/]master/master/; @@ -91,6 +94,7 @@ flush logs; --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect SET SESSION debug_dbug="+d,crash_purge_before_update_index"; +--source include/wait_for_binlog_checkpoint.inc --error 2013 purge binary logs TO 'master-bin.000002'; @@ -111,6 +115,7 @@ flush logs; --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect SET SESSION debug_dbug="+d,crash_purge_non_critical_after_update_index"; +--source include/wait_for_binlog_checkpoint.inc --error 2013 purge binary logs TO 'master-bin.000004'; @@ -134,6 +139,7 @@ flush logs; --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect SET SESSION debug_dbug="+d,crash_purge_critical_after_update_index"; +--source include/wait_for_binlog_checkpoint.inc --error 2013 purge binary logs TO 'master-bin.000006'; diff --git a/mysql-test/suite/rpl/t/rpl_checksum.test b/mysql-test/suite/rpl/t/rpl_checksum.test index bd0ab7ecc9c..ff7d2801911 100644 --- a/mysql-test/suite/rpl/t/rpl_checksum.test +++ b/mysql-test/suite/rpl/t/rpl_checksum.test @@ -95,6 +95,7 @@ source include/stop_slave.inc; connection master; set @@global.binlog_checksum = CRC32; +-- source include/wait_for_binlog_checkpoint.inc insert into t1 values (1) /* will not be applied on slave due to simulation */; # instruction to the dump thread diff --git a/mysql-test/suite/rpl/t/rpl_rotate_logs.test b/mysql-test/suite/rpl/t/rpl_rotate_logs.test index 273786cf807..358c0be5b3b 100644 --- a/mysql-test/suite/rpl/t/rpl_rotate_logs.test +++ b/mysql-test/suite/rpl/t/rpl_rotate_logs.test @@ -109,6 +109,7 @@ source include/show_master_logs.inc; # we just tests if synonyms are accepted purge binary logs to 'master-bin.000002'; source include/show_binary_logs.inc; +--source include/wait_for_binlog_checkpoint.inc # Set the purge time 1 second after the last modify time of master-bin.000002. perl; diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index e167893fb9f..e5bc36f6851 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -551,6 +551,7 @@ DROP TABLE t1; DROP DATABASE test1; let $master_binlog= query_get_value(SHOW MASTER STATUS, File, 1); FLUSH LOGS; +--source include/wait_for_binlog_checkpoint.inc let $MYSQLD_DATADIR= `SELECT @@datadir`; exec $MYSQL_BINLOG $MYSQLD_DATADIR/$master_binlog | $MYSQL test 2>&1; |