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_select.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_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index e4772bf3fb2..e5d574192b1 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -567,7 +567,8 @@ JOIN::prepare(Item ***rref_pointer_array, thd->lex->allow_sum_func= save_allow_sum_func; } - if (!thd->lex->view_prepare_mode && !(select_options & SELECT_DESCRIBE)) + if (!(thd->lex->context_analysis_only & CONTEXT_ANALYSIS_ONLY_VIEW) && + !(select_options & SELECT_DESCRIBE)) { Item_subselect *subselect; /* Is it subselect? */ |