From 73c03f8ae954c847996fde6327d2add3ef5682b0 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 17 Apr 2006 18:57:01 -0400 Subject: [PATCH] Fixing a merge from a few days ago. Without a flush this test is nondeterministic for "row" binlog-format. mysql-test/r/innodb.result: Without a flush this test is nondeterministic for "row" binlog-format. mysql-test/t/innodb.test: Without a flush this test is nondeterministic for "row" binlog-format. --- mysql-test/r/innodb.result | 7 ++++--- mysql-test/t/innodb.test | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 25e92516be8..04e280fad3e 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -1640,16 +1640,17 @@ t2 CREATE TABLE `t2` ( CONSTRAINT `t2_ibfk_2` FOREIGN KEY (`b`) REFERENCES `t1` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 drop table t2, t1; +flush status; show status like "binlog_cache_use"; Variable_name Value -Binlog_cache_use 155 +Binlog_cache_use 0 show status like "binlog_cache_disk_use"; Variable_name Value Binlog_cache_disk_use 0 create table t1 (a int) engine=innodb; show status like "binlog_cache_use"; Variable_name Value -Binlog_cache_use 156 +Binlog_cache_use 1 show status like "binlog_cache_disk_use"; Variable_name Value Binlog_cache_disk_use 1 @@ -1658,7 +1659,7 @@ delete from t1; commit; show status like "binlog_cache_use"; Variable_name Value -Binlog_cache_use 157 +Binlog_cache_use 2 show status like "binlog_cache_disk_use"; Variable_name Value Binlog_cache_disk_use 1 diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index 63349adfd59..18b47c39a10 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -1146,6 +1146,7 @@ drop table t2, t1; # Actually this test has nothing to do with innodb per se, it just requires # transactional table. # +flush status; show status like "binlog_cache_use"; show status like "binlog_cache_disk_use";