Fix a bad merge
953f847aedcb was lost
This commit is contained in:
parent
54ab281de8
commit
38ffaeadab
@ -266,8 +266,8 @@ bool extend_option_list(THD* thd, st_plugin_int *plugin, bool create,
|
|||||||
value, opt->type != HA_OPTION_TYPE_ULL);
|
value, opt->type != HA_OPTION_TYPE_ULL);
|
||||||
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;
|
||||||
}
|
}
|
||||||
val->link(option_list, &last);
|
val->link(option_list, &last);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user