bk commit into 5.1 tree (cmiller:1.2365)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2365 06/04/17 17:32:20 cmiller@zippy.(none) +2 -0
  Fixing a merge from a few days ago.
  
  Without a flush this test is nondeterministic for "row" binlog-format.

  mysql-test/t/innodb.test
    1.137 06/04/17 17:32:15 cmiller@zippy.(none) +1 -0
    Without a flush this test is nondeterministic for "row" binlog-format.

  mysql-test/r/innodb.result
    1.170 06/04/17 17:32:15 cmiller@zippy.(none) +4 -3
    Without a flush this test is nondeterministic for "row" binlog-format.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cmiller
# Host:	zippy.(none)
# Root:	/home/cmiller/work/mysql/mysql-5.1-new

--- 1.169/mysql-test/r/innodb.result	2006-04-14 11:39:33 -04:00
+++ 1.170/mysql-test/r/innodb.result	2006-04-17 17:32:15 -04:00
@@ -1640,16 +1640,17 @@
   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 @@
 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

--- 1.136/mysql-test/t/innodb.test	2006-04-14 11:39:33 -04:00
+++ 1.137/mysql-test/t/innodb.test	2006-04-17 17:32:15 -04:00
@@ -1146,6 +1146,7 @@
 # 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";