File tree Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -8822,15 +8822,16 @@ bool TABLE_LIST::change_refs_to_fields()
8822
8822
List_iterator<Item> li (used_items);
8823
8823
Item_direct_ref *ref;
8824
8824
Field_iterator_view field_it;
8825
+ Name_resolution_context *ctx;
8825
8826
THD *thd= table->in_use ;
8827
+ Item **materialized_items;
8826
8828
DBUG_ASSERT (is_merged_derived ());
8827
8829
8828
8830
if (!used_items.elements )
8829
8831
return FALSE ;
8830
8832
8831
- Item **materialized_items=
8832
- (Item **)thd->calloc (sizeof (void *) * table->s ->fields );
8833
- Name_resolution_context *ctx= new Name_resolution_context (this );
8833
+ materialized_items= (Item **)thd->calloc (sizeof (void *) * table->s ->fields );
8834
+ ctx= new (thd->mem_root ) Name_resolution_context (this );
8834
8835
if (!materialized_items || !ctx)
8835
8836
return TRUE ;
8836
8837
You can’t perform that action at this time.
0 commit comments