Fix a bad merge

vuvova · vuvova · commit 38ffaeadab09 · 2024-11-13T16:38:53.000+01:00
953f847 was lost
diff --git a/sql/create_options.cc b/sql/create_options.cc
@@ -266,8 +266,8 @@ bool extend_option_list(THD* thd, st_plugin_int *plugin, bool create,
                                         value, opt->type != HA_OPTION_TYPE_ULL);
             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;
             }
             val->link(option_list, &last);

Original file line number	Diff line number	Diff line change
`@@ -266,8 +266,8 @@ bool extend_option_list(THD* thd, st_plugin_int *plugin, bool create,`
`266`	`266`	`value, opt->type != HA_OPTION_TYPE_ULL);`
`267`	`267`	`if (!extended)`
`268`	`268`	`{`
`269`		`- void pos= option_list ? &(last->next) : option_list;`
`270`		`- thd->register_item_tree_change((Item**)pos);`
	`269`	`+ if (*option_list)`
	`270`	`+ thd->register_item_tree_change((Item**)&(last->next));`
`271`	`271`	`extended= true;`
`272`	`272`	`}`
`273`	`273`	`val->link(option_list, &last);`