diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-30 15:27:17 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-30 15:27:17 +0400 |
| commit | 26570994b272bba5cc4bd4d98ba30c9747ff5d50 (patch) | |
| tree | e985545604b0c3979ff3e20174ef78d3c640217e /sql | |
| parent | 4e378bc55bd3abdb83e6c14e2aea0a70c6d61ddf (diff) | |
| parent | 97374a11849f3b61ed431c1abe75a283d765e859 (diff) | |
| download | mariadb-git-26570994b272bba5cc4bd4d98ba30c9747ff5d50.tar.gz | |
Automerge.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index a426f4b68a1..291432c2bb6 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1107,8 +1107,7 @@ JOIN::optimize() } if (conds && const_table_map != found_const_table_map && - (select_options & SELECT_DESCRIBE) && - select_lex->master_unit() == &thd->lex->unit) // upper level SELECT + (select_options & SELECT_DESCRIBE)) { conds=new Item_int((longlong) 0,1); // Always false } |