after merging fix

e4c6a484 · unknown · c2d9d9ff · e4c6a484 · e4c6a484
Commit e4c6a484 authored Nov 05, 2002 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/item_sum.cc sql/item_sum.cc +1 -1

sql/sql_yacc.yy sql/sql_yacc.yy +1 -1

No files found.
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -43,7 +43,7 @@ Item_sum::Item_sum(List<Item> &list)

 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)

--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -4258,7 +4258,7 @@ in_subselect:
 in_subselect_init:
  select_init
  {
-    $$= Lex->select->master_unit()->first_select();
+    $$= Lex->current_select->master_unit()->first_select();
  };

 subselect_start: