database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge mariadb 5.3->mariadb 5.5

Browse Source
This commit is contained in:
unknown
2012-03-24 18:21:22 +01:00
parent b34cfe9327 f72e0e686b
commit 335de5db18
42 changed files with 893 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/filesort_debug.result
View File

@ -4,7 +4,7 @@ SET @old_debug= @@session.debug;
#
CREATE TABLE t1(f0 int auto_increment primary key, f1 int);
INSERT INTO t1(f1) VALUES (0),(1),(2),(3),(4),(5);
SET session debug_dbug= '+d,make_char_array_fail';
SET session debug_dbug= '+d,make_sort_keys_alloc_fail';
CALL mtr.add_suppression("Out of sort memory");
SELECT * FROM t1 ORDER BY f1 ASC, f0;
ERROR HY001: Out of sort memory, consider increasing server sort buffer size