database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '11.6' into 11.7

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-11-09 19:01:12 +01:00
parent 7aa28a2a54 d8dad8c3b5
commit b12ff287ec
789 changed files with 10342 additions and 4415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/create_options.cc
View File

@@ -513,7 +513,7 @@ bool parse_engine_part_options(THD *thd, TABLE *table)
{
ht= part_elem->engine_type;
if (parse_option_list(thd, &part_elem->option_struct,
&tmp_option_list, ht->table_options, TRUE, root))
&tmp_option_list, ht->table_options, TRUE, root))
DBUG_RETURN(TRUE);
}
else
@@ -523,7 +523,7 @@ bool parse_engine_part_options(THD *thd, TABLE *table)
{
ht= sub_part_elem->engine_type;
if (parse_option_list(thd, &sub_part_elem->option_struct,
&tmp_option_list, ht->table_options, TRUE, root))
&tmp_option_list, ht->table_options, TRUE, root))
DBUG_RETURN(TRUE);
}
}