diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-07-13 14:17:14 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-07-13 14:17:14 +0300 |
| commit | 42cab12a9366a42ae6dd2dee9024d9a56467bda3 (patch) | |
| tree | 9e0bfe6af5e38d867b1b74c36731ea9031e206a5 | |
| parent | 924c8c5bfbc346de72d27a06fa5d6cb87b471c08 (diff) | |
| download | mariadb-git-42cab12a9366a42ae6dd2dee9024d9a56467bda3.tar.gz | |
Addendum to the fix for bug #46080: fixed the error handling
| -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; |