mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Post-fix for MDEV-35236
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 3cd706b107
This commit is contained in:
@ -285,8 +285,8 @@ bool extend_option_list(THD* thd, handlerton *hton, bool create,
|
||||
{
|
||||
if (!extended)
|
||||
{
|
||||
void *pos= *option_list ? &(last->next) : option_list;
|
||||
thd->register_item_tree_change((Item**)pos);
|
||||
if (*option_list)
|
||||
thd->register_item_tree_change((Item**)&(last->next));
|
||||
extended= true;
|
||||
}
|
||||
new (root) engine_option_value(name, value,
|
||||
|
Reference in New Issue
Block a user