automerge

mysql-test/r/bug46080.result

@@ -7,7 +7,8 @@ INSERT INTO t1 VALUES ('a');
 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
+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;

mysql-test/t/bug46080.test

@@ -9,7 +9,8 @@ INSERT INTO t1 VALUES ('a');
 SET @@SESSION.sort_buffer_size=5*16*1000000;
 SET @@SESSION.max_heap_table_size=5*1000000;
 
-echo # Must not crash.
+--echo # Must not crash.
+--error 5,0
 SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a;
 
 DROP TABLE t1;