diff options
author | unknown <knielsen@knielsen-hq.org> | 2012-12-18 15:01:58 +0100 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2012-12-18 15:01:58 +0100 |
commit | 701419b02f12688188a7d4183523e0f5ee9ae09a (patch) | |
tree | 9cad9901bbf188c5ab30aeb31f10c71f61921312 /mysql-test/suite/binlog/t/binlog_checkpoint.test | |
parent | 4923d19b7c3c4c034f70ac1411837afa75c4b6ad (diff) | |
parent | 6c3de76ad5cb8683ab8b049e0bbba670115d304a (diff) | |
download | mariadb-git-701419b02f12688188a7d4183523e0f5ee9ae09a.tar.gz |
Merge MariaDB 10.0-base to MariaDB 10.0
Diffstat (limited to 'mysql-test/suite/binlog/t/binlog_checkpoint.test')
-rw-r--r-- | mysql-test/suite/binlog/t/binlog_checkpoint.test | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/suite/binlog/t/binlog_checkpoint.test b/mysql-test/suite/binlog/t/binlog_checkpoint.test index 557791c77e5..8c84e51c4df 100644 --- a/mysql-test/suite/binlog/t/binlog_checkpoint.test +++ b/mysql-test/suite/binlog/t/binlog_checkpoint.test @@ -71,6 +71,12 @@ SET DEBUG_SYNC= "now WAIT_FOR con2_ready"; --let $binlog_file= master-bin.000003 --source include/show_binlog_events.inc +# We need to sync the test case with the background processing of the +# commit checkpoint, otherwise we get nondeterministic results. +SET DEBUG_SYNC= "RESET"; +SET @old_dbug= @@global.DEBUG_DBUG; +SET GLOBAL debug_dbug="+d,binlog_background_checkpoint_processed"; + SET DEBUG_SYNC= "now SIGNAL con2_continue"; connection con2; @@ -78,6 +84,12 @@ reap; connection default; --echo con1 is still pending, no new binlog checkpoint should have been logged. +# Make sure commit checkpoint is processed before we check that no checkpoint +# event has been binlogged. +SET DEBUG_SYNC= "now WAIT_FOR binlog_background_checkpoint_processed"; +SET GLOBAL debug_dbug= @old_dbug; +SET DEBUG_SYNC= "RESET"; + --let $binlog_file= master-bin.000003 --source include/show_binlog_events.inc |