1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge 5.0-bugteam -> 5.1-bugteam

Browse Source
This commit is contained in:
Georgi Kodinov 2009-07-13 14:34:23 +03:00
commit 68228070f8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/bug46080.result
View File

@ -8,7 +8,6 @@ SET @@SESSION.sort_buffer_size=5*16*1000000;
SET @@SESSION.max_heap_table_size=5*1000000; SET @@SESSION.max_heap_table_size=5*1000000;
# Must not crash. # 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; DROP TABLE t1;
SET @@SESSION.sort_buffer_size=default; SET @@SESSION.sort_buffer_size=default;
SET @@SESSION.max_heap_table_size=default; SET @@SESSION.max_heap_table_size=default;

4
mysql-test/t/bug46080.test
View File

@ -10,8 +10,10 @@ SET @@SESSION.sort_buffer_size=5*16*1000000;
SET @@SESSION.max_heap_table_size=5*1000000; SET @@SESSION.max_heap_table_size=5*1000000;
--echo # Must not crash. --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; SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a;
--enable_result_log
DROP TABLE t1; DROP TABLE t1;
SET @@SESSION.sort_buffer_size=default; SET @@SESSION.sort_buffer_size=default;