Merge

0c4bd74c · Marko Mäkelä · 67b09e5d · e3dc155d · 0c4bd74c · 0c4bd74c
Commit 0c4bd74c authored Apr 27, 2010 by Marko Mäkelä
5 changed files
--- a/mysql-test/suite/innodb/r/innodb.result
+++ b/mysql-test/suite/innodb/r/innodb.result
--- a/mysql-test/suite/innodb/r/innodb_misc1.result
+++ b/mysql-test/suite/innodb/r/innodb_misc1.result
--- a/mysql-test/suite/innodb/t/innodb.test
+++ b/mysql-test/suite/innodb/t/innodb.test
--- a/mysql-test/suite/innodb/t/innodb_misc1-master.opt
+++ b/mysql-test/suite/innodb/t/innodb_misc1-master.opt
+--binlog_cache_size=32768 --innodb_lock_wait_timeout=1
--- a/mysql-test/suite/innodb/t/innodb_misc1.test
+++ b/mysql-test/suite/innodb/t/innodb_misc1.test