1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post-fix for MDEV-35236

Browse Source 
when the option_list is initially empty, its value doesn't need
to be restored, as it'll be shallow-copied every time.
Furthermore, the CREATE_INFO is allocated on the stack, so it's
even wrong to restore it after its frame was left.

followup for 3cd706b107d
This commit is contained in:
Sergei Golubchik 2024-10-28 10:29:27 +01:00
parent 4b068b7fcb
commit 953f847aed
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/create_options.cc
View File

@ -285,8 +285,8 @@ bool extend_option_list(THD* thd, handlerton *hton, bool create,
{ {
if (!extended) if (!extended)
{ {
void *pos= *option_list ? &(last->next) : option_list; if (*option_list)
thd->register_item_tree_change((Item**)pos); thd->register_item_tree_change((Item**)&(last->next));
extended= true; extended= true;
} }
new (root) engine_option_value(name, value, new (root) engine_option_value(name, value,