Merge mysql-5.1-security to mysql-5.5-security.

8dc6fc3d · Marko Mäkelä · 7ef002e9 · 5cd2cb0c · 8dc6fc3d · 8dc6fc3d
Commit 8dc6fc3d authored Oct 26, 2011 by Marko Mäkelä
3 changed files
--- 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_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