diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-07-13 14:34:23 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-07-13 14:34:23 +0300 |
| commit | adff023c71e6c2af80ec3b8235d1a0c078995f51 (patch) | |
| tree | c13cd9f151abd0aff4334f5786a4f671e557894d /mysql-test | |
| parent | 606e5bf6993463df0d7584f97b59446192f64a3e (diff) | |
| parent | dccac4ff113a1709a9755da4da51880b4a8a8996 (diff) | |
| download | mariadb-git-adff023c71e6c2af80ec3b8235d1a0c078995f51.tar.gz | |
merge 5.0-bugteam -> 5.1-bugteam
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/bug46080.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/bug46080.test | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/bug46080.result b/mysql-test/r/bug46080.result index f69c4ac1f71..18c7c22829a 100644 --- a/mysql-test/r/bug46080.result +++ b/mysql-test/r/bug46080.result @@ -8,7 +8,6 @@ SET @@SESSION.sort_buffer_size=5*16*1000000; SET @@SESSION.max_heap_table_size=5*1000000; # Must not crash. SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a; -Got one of the listed errors DROP TABLE t1; SET @@SESSION.sort_buffer_size=default; SET @@SESSION.max_heap_table_size=default; diff --git a/mysql-test/t/bug46080.test b/mysql-test/t/bug46080.test index 277d513f3e5..7e56e3ce421 100644 --- a/mysql-test/t/bug46080.test +++ b/mysql-test/t/bug46080.test @@ -10,8 +10,10 @@ SET @@SESSION.sort_buffer_size=5*16*1000000; SET @@SESSION.max_heap_table_size=5*1000000; --echo # Must not crash. ---error 5,0 +--disable_result_log +--error 0,5 SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a; +--enable_result_log DROP TABLE t1; SET @@SESSION.sort_buffer_size=default; |