summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-07-10 17:07:36 +0300
committerGeorgi Kodinov <joro@sun.com>2009-07-10 17:07:36 +0300
commit9752d4c8665db722bfb63e2ded8c221d2c5733fa (patch)
tree9d3cb3da414b09a85625a6c540d334e245ba412d /mysql-test/r
parente5ecb481250f0599f4f79f28753cf0aebd0db853 (diff)
parent924c8c5bfbc346de72d27a06fa5d6cb87b471c08 (diff)
downloadmariadb-git-9752d4c8665db722bfb63e2ded8c221d2c5733fa.tar.gz
automerge
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/bug46080.result3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/bug46080.result b/mysql-test/r/bug46080.result
index 9ae4b55d8ea..f69c4ac1f71 100644
--- a/mysql-test/r/bug46080.result
+++ b/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;