summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorYasufumi Kinoshita <yasufumi.kinoshita@oracle.com>2013-01-31 12:45:08 +0900
committerYasufumi Kinoshita <yasufumi.kinoshita@oracle.com>2013-01-31 12:45:08 +0900
commit4dcd030420584ad6d851863de4e87745fcfb080a (patch)
tree227b1d58db012aa11a5058f4fba5df379df0aa74 /mysql-test
parentdbd25312fea9cabf6542fb938d9b163114cab0fd (diff)
parentc3d2803c43d4076428763c50632217cb70c751d5 (diff)
downloadmariadb-git-4dcd030420584ad6d851863de4e87745fcfb080a.tar.gz
merge to mysql-5.5 from mysql-5.1
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/innodb/t/innodb_bug12400341.test4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/t/innodb_bug12400341.test b/mysql-test/suite/innodb/t/innodb_bug12400341.test
index 2ab1be81f6d..ab69e20c495 100644
--- 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