diff options
| author | Georgi Kodinov <joro@sun.com> | 2010-02-02 14:17:21 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2010-02-02 14:17:21 +0200 |
| commit | 1dafac6f35b23757cafe0ac1ef9f6b4edb28947d (patch) | |
| tree | 2c236fc56603283a9faec205f8925c6e1568cb12 /mysql-test | |
| parent | 9b75c2f268f0e40fe74f38759c8f8551b2637145 (diff) | |
| download | mariadb-git-1dafac6f35b23757cafe0ac1ef9f6b4edb28947d.tar.gz | |
fixed various pb2 test failures on windows.
Diffstat (limited to 'mysql-test')
| -rwxr-xr-x[-rw-r--r--] | mysql-test/r/bug46080.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/bug46080.test | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/bug46080.result b/mysql-test/r/bug46080.result index 2173768cdad..602027be43e 100644..100755 --- a/mysql-test/r/bug46080.result +++ b/mysql-test/r/bug46080.result @@ -2,8 +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"); +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/t/bug46080.test b/mysql-test/t/bug46080.test index 8b4cee4d8b0..ed4a16fdf51 100644 --- a/mysql-test/t/bug46080.test +++ b/mysql-test/t/bug46080.test @@ -3,8 +3,8 @@ --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"); +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'); |