database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

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

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


sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown
2003-10-25 10:18:37 +03:00
parent f38d78943c 1ba35900d6
commit f8b833c9f2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@@ -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)
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;
} }
} }