mirror of
https://github.com/MariaDB/server.git
synced 2026-04-27 18:55:31 +02:00
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
This commit is contained in:
commit
a837775acb
2 changed files with 18 additions and 1 deletions
|
|
@ -3708,7 +3708,6 @@ mysql_new_select(LEX *lex, bool move_down)
|
|||
unit->link_prev= 0;
|
||||
unit->return_to= lex->current_select;
|
||||
select_lex->include_down(unit);
|
||||
// TODO: assign resolve_mode for fake subquery after merging with new tree
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -3728,6 +3727,7 @@ mysql_new_select(LEX *lex, bool move_down)
|
|||
fake->make_empty_select();
|
||||
fake->linkage= GLOBAL_OPTIONS_TYPE;
|
||||
fake->select_limit= lex->thd->variables.select_limit;
|
||||
fake->resolve_mode= SELECT_LEX::SELECT_MODE;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue