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 | 0f5afe5d7f6eacb125475e43372574bb97387c47 (patch) | |
| tree | e985545604b0c3979ff3e20174ef78d3c640217e /sql/sql_select.cc | |
| parent | 55b7b7563725f3f4273c3175cfa0d867afc18857 (diff) | |
| parent | 96366e1196484db3270196c84859fc8eea8cf656 (diff) | |
| download | mariadb-git-0f5afe5d7f6eacb125475e43372574bb97387c47.tar.gz | |
Automerge.
Diffstat (limited to 'sql/sql_select.cc')
| -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 } |