mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-29 11:45:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-35236 Assertion `(mem_root->flags & 4) == 0' failed in safe_lexcstrdup_root

Browse source 
followup for MDEV-35092
This commit is contained in:
Sergei Golubchik 2024-10-23 14:25:11 +02:00
commit 14364b09b9
6 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
sql/sql_table.cc
View file

@ -3006,8 +3006,7 @@ mysql_prepare_create_table_finalize(THD *thd, HA_CREATE_INFO *create_info,
auto_increment++;
extend_option_list(thd, create_info->db_type, !sql_field->field,
&sql_field->option_list,
create_info->db_type->field_options,
thd->stmt_arena->mem_root);
create_info->db_type->field_options);
if (parse_option_list(thd, &sql_field->option_struct,
&sql_field->option_list,
create_info->db_type->field_options, FALSE,
@ -3295,7 +3294,7 @@ mysql_prepare_create_table_finalize(THD *thd, HA_CREATE_INFO *create_info,
key_info->algorithm= key->key_create_info.algorithm;
key_info->option_list= key->option_list;
extend_option_list(thd, index_plugin, !key->old, &key_info->option_list,
index_options, thd->stmt_arena->mem_root);
index_options);
if (parse_option_list(thd, &key_info->option_struct, &key_info->option_list,
index_options, FALSE, thd->mem_root))
DBUG_RETURN(TRUE);
@ -3891,10 +3890,8 @@ without_overlaps_err:
ER_THD(thd, ER_UNKNOWN_OPTION), "transactional");
extend_option_list(thd, file->partition_ht(),
create_table_mode > C_ALTER_TABLE,
&create_info->option_list,
file->partition_ht()->table_options,
thd->stmt_arena->mem_root);
!thd->lex->create_like() && create_table_mode > C_ALTER_TABLE,
&create_info->option_list, file->partition_ht()->table_options);
if (parse_option_list(thd, &create_info->option_struct,
&create_info->option_list,
file->partition_ht()->table_options, FALSE,