merge to mysql-5.5 from mysql-5.1

2013-01-31 12:45:08 +09:00 · 2013-01-31 12:45:08 +09:00 · f57cba0ca0
commit f57cba0ca0
parent 2b4a942a10 5656b9dd6c
1 changed files with 4 additions and 0 deletions
--- a/mysql-test/suite/innodb/t/innodb_bug12400341.test
+++ b/mysql-test/suite/innodb/t/innodb_bug12400341.test
@ -7,6 +7,10 @@ if (`select count(*)=0 from information_schema.global_variables where variable_n
  --skip Test requires InnoDB built with UNIV_DEBUG definition.
 }

+# Don't test under valgrind, undo slots of the previous test might exist still
+# and cause unstable result.
+--source include/not_valgrind.inc
+
 call mtr.add_suppression("InnoDB: Warning: cannot find a free slot for an undo log. Do you have too");

 --disable_query_log