summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysql-test/r/bug46080.result1
-rw-r--r--mysql-test/t/bug46080.test4
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;