diff options
author | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-09-05 09:40:18 +0200 |
---|---|---|
committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-09-05 09:40:18 +0200 |
commit | 645f7841cf09294eb70838eaee58928a10f615a8 (patch) | |
tree | 7febc1cc7e7d3430d5e03ccc844549ae81459d45 /mysql-test/r/bug46080.result | |
parent | 29a142043ede302725a78b4f780cc016dcdf12bf (diff) | |
download | mariadb-git-645f7841cf09294eb70838eaee58928a10f615a8.tar.gz |
followup fixes after merge to -trunk
Diffstat (limited to 'mysql-test/r/bug46080.result')
-rw-r--r-- | mysql-test/r/bug46080.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/bug46080.result b/mysql-test/r/bug46080.result index 18c7c22829a..2173768cdad 100644 --- a/mysql-test/r/bug46080.result +++ b/mysql-test/r/bug46080.result @@ -2,6 +2,8 @@ # Bug #46080: group_concat(... order by) crashes server when # sort_buffer_size cannot allocate # +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'); SET @@SESSION.sort_buffer_size=5*16*1000000; |