diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-09-03 08:38:06 +0200 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-09-03 08:38:06 +0200 |
| commit | aabcb80e95f3e20e16ecb41183c50a29a72e19aa (patch) | |
| tree | da4c46d6580a84e8bf2ebcdcce09cc817c5378aa /mysql-test | |
| parent | 39fca129fbcb6a99f9968f9f4c3842c3122c29df (diff) | |
| download | mariadb-git-aabcb80e95f3e20e16ecb41183c50a29a72e19aa.tar.gz | |
A few suppression follow-ups
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/bug46080.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/partition_csv.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/bug46080.test | 3 | ||||
| -rw-r--r-- | mysql-test/t/partition_csv.test | 2 |
4 files changed, 8 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; diff --git a/mysql-test/r/partition_csv.result b/mysql-test/r/partition_csv.result index 07651f29da4..18e28d4670a 100644 --- a/mysql-test/r/partition_csv.result +++ b/mysql-test/r/partition_csv.result @@ -1,3 +1,4 @@ +call mtr.add_suppression("Failed to write to mysql.general_log"); drop table if exists t1; create table t1 (a int) engine = csv diff --git a/mysql-test/t/bug46080.test b/mysql-test/t/bug46080.test index 7e56e3ce421..8b4cee4d8b0 100644 --- a/mysql-test/t/bug46080.test +++ b/mysql-test/t/bug46080.test @@ -3,6 +3,9 @@ --echo # sort_buffer_size cannot allocate --echo # +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'); diff --git a/mysql-test/t/partition_csv.test b/mysql-test/t/partition_csv.test index dd2ef7c1d1f..44013dd4b0a 100644 --- a/mysql-test/t/partition_csv.test +++ b/mysql-test/t/partition_csv.test @@ -10,6 +10,8 @@ --source include/have_partition.inc --source include/have_csv.inc +call mtr.add_suppression("Failed to write to mysql.general_log"); + # # Bug#19307: Partitions: csv delete failure # = CSV engine crashes |