Commit f3f6514f authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new
parents 11e295ad 73c03f8a

mysql-test/r/innodb.result

+4 −3
Original line number Diff line number Diff line
@@ -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

mysql-test/t/innodb.test

+1 −0
Original line number Diff line number Diff line
@@ -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";