diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-03-24 18:21:22 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-03-24 18:21:22 +0100 |
| commit | 335de5db1834d3aeac507f18fcd5143c22150500 (patch) | |
| tree | 95ac83922a28c81982c9ad89fcaba6c040b5111b /mysql-test/t/filesort_debug.test | |
| parent | b34cfe9327f2dcedb6bebfacdc2e757b6285426d (diff) | |
| parent | f72e0e686b2f3688fe98685107a293de5012be03 (diff) | |
| download | mariadb-git-335de5db1834d3aeac507f18fcd5143c22150500.tar.gz | |
Merge mariadb 5.3->mariadb 5.5
Diffstat (limited to 'mysql-test/t/filesort_debug.test')
| -rw-r--r-- | mysql-test/t/filesort_debug.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/filesort_debug.test b/mysql-test/t/filesort_debug.test index 88d957e47c3..817b41ab16d 100644 --- a/mysql-test/t/filesort_debug.test +++ b/mysql-test/t/filesort_debug.test @@ -11,7 +11,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"); --error ER_OUT_OF_SORTMEMORY SELECT * FROM t1 ORDER BY f1 ASC, f0; |