summaryrefslogtreecommitdiff
path: root/mysql-test/suite/maria/maria.test
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2019-08-08 23:04:05 +0300
committerSergei Golubchik <serg@mariadb.org>2019-08-23 11:26:04 +0200
commit6c50875a380aabb9da8926b785524e813e98a82d (patch)
tree8ce40297412f1bcd62830f4e52e308d9f4c8ea57 /mysql-test/suite/maria/maria.test
parentafe969ba05faece41fdef1275e9b9c510081805b (diff)
downloadmariadb-git-6c50875a380aabb9da8926b785524e813e98a82d.tar.gz
MDEV-20279 Increase Aria index length limit
Limit increased from 1000 to 2000. Avoiding stack overflow by only storing keys and pages on the stack in recursive functions if there is plenty of space on it. Other things: - Use less stack space for b-tree operations as we now only allocate as much space as needed instead of always allocating HA_MAX_KEY_LENGTH. - Replaced most usage of my_safe_alloca() in Aria with the stack_alloc interface. - Moved my_setstacksize() to mysys/my_pthread.c
Diffstat (limited to 'mysql-test/suite/maria/maria.test')
-rw-r--r--mysql-test/suite/maria/maria.test6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/maria/maria.test b/mysql-test/suite/maria/maria.test
index d5b9d839699..920443d4338 100644
--- a/mysql-test/suite/maria/maria.test
+++ b/mysql-test/suite/maria/maria.test
@@ -373,12 +373,12 @@ drop table t1;
#
--error 1071
-CREATE TABLE t1 (a varchar(255), b varchar(255), c varchar(255), d varchar(255), e varchar(255), KEY t1 (a, b, c, d, e));
+CREATE TABLE t1 (a varchar(255), b varchar(255), c varchar(255), d varchar(255), e varchar(255), f varchar(255), g varchar(255), h varchar(255), i varchar(255), KEY t1 (a, b, c, d, e, f, g, h, i));
--error 1070
CREATE TABLE t1 (a varchar(1), b varchar(1), key (a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b,a,b));
-CREATE TABLE t1 (a varchar(255), b varchar(255), c varchar(255), d varchar(255), e varchar(255));
+CREATE TABLE t1 (a varchar(255), b varchar(255), c varchar(255), d varchar(255), e varchar(255), f varchar(255), g varchar(255), h varchar(255), i varchar(255));
--error 1071
-ALTER TABLE t1 ADD INDEX t1 (a, b, c, d, e);
+ALTER TABLE t1 ADD INDEX t1 (a, b, c, d, e, f, g, h, i);
DROP TABLE t1;
#