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-35092 Server crash, hang or ASAN errors in mysql_create_frm_image upon using non-default table options and system variables

Browse source 
extend the option_list expicitly on CREATE/ALTER, not implicitly
on parsing.
This commit is contained in:
Sergei Golubchik 2024-10-08 14:56:35 +02:00
commit 7d9c0e4f62
7 changed files with 138 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

29
sql/sql_table.cc
View file

@ -3032,10 +3032,14 @@ mysql_prepare_create_table_finalize(THD *thd, HA_CREATE_INFO *create_info,
sql_field->offset= record_offset;
if (MTYP_TYPENR(sql_field->unireg_check) == Field::NEXT_NUMBER)
auto_increment++;
if (parse_option_list(thd, create_info->db_type, &sql_field->option_struct,
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);
if (parse_option_list(thd, &sql_field->option_struct,
&sql_field->option_list,
create_info->db_type->field_options, FALSE,
sql_field->field == NULL, thd->mem_root))
thd->mem_root))
DBUG_RETURN(TRUE);
/*
For now skip fields that are not physically stored in the database
@ -3318,9 +3322,10 @@ mysql_prepare_create_table_finalize(THD *thd, HA_CREATE_INFO *create_info,
key_info->usable_key_parts= key_number;
key_info->algorithm= key->key_create_info.algorithm;
key_info->option_list= key->option_list;
if (parse_option_list(thd, index_plugin, &key_info->option_struct,
&key_info->option_list, index_options,
FALSE, !key->old, thd->mem_root))
extend_option_list(thd, index_plugin, !key->old, &key_info->option_list,
index_options, thd->stmt_arena->mem_root);
if (parse_option_list(thd, &key_info->option_struct, &key_info->option_list,
index_options, FALSE, thd->mem_root))
DBUG_RETURN(TRUE);
if (key->type == Key::FULLTEXT)
@ -3913,11 +3918,15 @@ without_overlaps_err:
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, ER_UNKNOWN_OPTION,
ER_THD(thd, ER_UNKNOWN_OPTION), "transactional");
if (parse_option_list(thd, file->partition_ht(), &create_info->option_struct,
&create_info->option_list,
file->partition_ht()->table_options, FALSE,
create_table_mode > C_ALTER_TABLE,
thd->mem_root))
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);
if (parse_option_list(thd, &create_info->option_struct,
&create_info->option_list,
file->partition_ht()->table_options, FALSE,
thd->mem_root))
DBUG_RETURN(TRUE);
DBUG_EXECUTE_IF("key",