diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2010-12-14 13:46:00 +0300 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2010-12-14 13:46:00 +0300 |
| commit | e6bf102466847e992c8cec894b7ef6bb7a971c8b (patch) | |
| tree | fefb04085998222a7c9fcd629b204667e76e3a20 /sql/sql_derived.cc | |
| parent | 8d311a855164416744c35742a3e1368c49ca6c1a (diff) | |
| parent | fcb83cbf15653bbed15936d8eafb4fc7de3e743b (diff) | |
| download | mariadb-git-e6bf102466847e992c8cec894b7ef6bb7a971c8b.tar.gz | |
5.1-bugteam->5.5-bugteam merge
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 47bc13beb53..4a7b3e98935 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -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; |