Commit f8b833c9 authored by unknown's avatar unknown

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


sql/sql_parse.cc:
  Auto merged
parents f38d7894 1ba35900
...@@ -3668,7 +3668,6 @@ mysql_new_select(LEX *lex, bool move_down) ...@@ -3668,7 +3668,6 @@ mysql_new_select(LEX *lex, bool move_down)
unit->link_prev= 0; unit->link_prev= 0;
unit->return_to= lex->current_select; unit->return_to= lex->current_select;
select_lex->include_down(unit); select_lex->include_down(unit);
// TODO: assign resolve_mode for fake subquery after merging with new tree
} }
else else
{ {
...@@ -3688,6 +3687,7 @@ mysql_new_select(LEX *lex, bool move_down) ...@@ -3688,6 +3687,7 @@ mysql_new_select(LEX *lex, bool move_down)
fake->make_empty_select(); fake->make_empty_select();
fake->linkage= GLOBAL_OPTIONS_TYPE; fake->linkage= GLOBAL_OPTIONS_TYPE;
fake->select_limit= lex->thd->variables.select_limit; fake->select_limit= lex->thd->variables.select_limit;
fake->resolve_mode= SELECT_LEX::SELECT_MODE;
} }
} }
......
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