summaryrefslogtreecommitdiff
path: root/storage/maria/ma_create.c
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 /storage/maria/ma_create.c
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 'storage/maria/ma_create.c')
-rw-r--r--storage/maria/ma_create.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ma_create.c b/storage/maria/ma_create.c
index e46f2048aee..f683c64f346 100644
--- a/storage/maria/ma_create.c
+++ b/storage/maria/ma_create.c
@@ -75,7 +75,7 @@ int maria_create(const char *name, enum data_file_type datafile_type,
uint max_field_lengths, extra_header_size, column_nr;
uint internal_table= flags & HA_CREATE_INTERNAL_TABLE;
ulong reclength, real_reclength,min_pack_length;
- char kfilename[FN_REFLEN], klinkname[FN_REFLEN], *klinkname_ptr;
+ char kfilename[FN_REFLEN], klinkname[FN_REFLEN], *klinkname_ptr= 0;
char dfilename[FN_REFLEN], dlinkname[FN_REFLEN], *dlinkname_ptr= 0;
ulong pack_reclength;
ulonglong tot_length,max_rows, tmp;