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

5.1-bugteam->5.5-bugteam merge

Browse Source
This commit is contained in:
Sergey Glukhov
2010-12-14 13:46:00 +03:00
parent 8d311a8551 fcb83cbf15
commit e6bf102466
24 changed files with 153 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_derived.cc
View File

@ -151,10 +151,11 @@ bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *orig_table_list)
if (!(derived_result= new select_union))
DBUG_RETURN(TRUE); // out of memory
lex->context_analysis_only|= CONTEXT_ANALYSIS_ONLY_DERIVED;
// st_select_lex_unit::prepare correctly work for single select
if ((res= unit->prepare(thd, derived_result, 0)))
goto exit;
lex->context_analysis_only&= ~CONTEXT_ANALYSIS_ONLY_DERIVED;
if ((res= check_duplicate_names(unit->types, 0)))
goto exit;