summaryrefslogtreecommitdiff
path: root/mysql-test/t/bug46080.test
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-02-03 19:21:17 +0300
committerAlexander Nozdrin <alik@sun.com>2010-02-03 19:21:17 +0300
commit1ab31553cafbb5e7e090c638f5dbc6647ee2d111 (patch)
tree33c92e57a94a700ac7dbcca5e9c0ff9181f1e6f0 /mysql-test/t/bug46080.test
parentab61c15efdf8da4152a98ee218b537ad6da625a9 (diff)
parentcf55cf596e33bb5287bb8336972dbe3ae35fdad4 (diff)
downloadmariadb-git-1ab31553cafbb5e7e090c638f5dbc6647ee2d111.tar.gz
Manual merge from mysql-trunk-merge.
Conflicts: - mysql-test/t/bug46080.test
Diffstat (limited to 'mysql-test/t/bug46080.test')
-rw-r--r--mysql-test/t/bug46080.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/bug46080.test b/mysql-test/t/bug46080.test
index 6daf12cf1c5..ed824529a9b 100644
--- a/mysql-test/t/bug46080.test
+++ b/mysql-test/t/bug46080.test
@@ -5,8 +5,8 @@
--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");
+call mtr.add_suppression("Out of memory at line .*, '.*my_alloc.c'");
+call mtr.add_suppression("needed .* byte (.*k)., memory in use: .* bytes (.*k)");
CREATE TABLE t1(a CHAR(255));
INSERT INTO t1 VALUES ('a');