summaryrefslogtreecommitdiff
path: root/mysql-test/t/bug46080.test
diff options
context:
space:
mode:
authorunknown <Dao-Gang.Qu@sun.com>2010-01-12 20:07:09 +0800
committerunknown <Dao-Gang.Qu@sun.com>2010-01-12 20:07:09 +0800
commit16e15e69523c5aebd6642a47b216f736cfd456a2 (patch)
tree81fd0ce6bdc321649671cd1240deb0d5b1248e49 /mysql-test/t/bug46080.test
parent4b67a11d2bf201e273be79054b26e90ada15be38 (diff)
parent3701208a2e890d42aabc678a2a5d4ea539941b36 (diff)
downloadmariadb-git-16e15e69523c5aebd6642a47b216f736cfd456a2.tar.gz
Manual merge from next-mr.
Diffstat (limited to 'mysql-test/t/bug46080.test')
-rw-r--r--mysql-test/t/bug46080.test2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/bug46080.test b/mysql-test/t/bug46080.test
index 8b4cee4d8b0..6daf12cf1c5 100644
--- a/mysql-test/t/bug46080.test
+++ b/mysql-test/t/bug46080.test
@@ -3,6 +3,8 @@
--echo # sort_buffer_size cannot allocate
--echo #
+--source include/have_debug.inc
+
call mtr.add_suppression("Out of memory at line .*, 'my_alloc.c'");
call mtr.add_suppression("needed .* byte .*k., memory in use: .* bytes .*k");