diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2010-03-26 11:46:18 +0400 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2010-03-26 11:46:18 +0400 |
| commit | 3658bde7361e862fd87ae5e28f03cc52c4e9fa6a (patch) | |
| tree | 1a93ebbfeade1cda83dd2afabd4b3ef3991556e2 /sql | |
| parent | 28e95ba535e175dc696fe7a739736ae9bf2a2b36 (diff) | |
| parent | f57839cd6060ff2d8edb4bf0875b67d0176d88e4 (diff) | |
| download | mariadb-git-3658bde7361e862fd87ae5e28f03cc52c4e9fa6a.tar.gz | |
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 77d63305b19..545f1cb6636 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1106,7 +1106,7 @@ JOIN::optimize() } } - if (conds &&!outer_join && const_table_map != found_const_table_map && + if (conds && const_table_map != found_const_table_map && (select_options & SELECT_DESCRIBE) && select_lex->master_unit() == &thd->lex->unit) // upper level SELECT { |