Commit e4c6a484 authored by unknown's avatar unknown

after merging fix

parent c2d9d9ff
...@@ -43,7 +43,7 @@ Item_sum::Item_sum(List<Item> &list) ...@@ -43,7 +43,7 @@ Item_sum::Item_sum(List<Item> &list)
void Item_sum::mark_as_sum_func() void Item_sum::mark_as_sum_func()
{ {
current_thd->lex.select->with_sum_func= with_sum_func= 1; current_thd->lex.current_select->with_sum_func= with_sum_func= 1;
} }
void Item_sum::make_field(Send_field *tmp_field) void Item_sum::make_field(Send_field *tmp_field)
......
...@@ -4258,7 +4258,7 @@ in_subselect: ...@@ -4258,7 +4258,7 @@ in_subselect:
in_subselect_init: in_subselect_init:
select_init select_init
{ {
$$= Lex->select->master_unit()->first_select(); $$= Lex->current_select->master_unit()->first_select();
}; };
subselect_start: subselect_start:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment