diff options
| author | unknown <sanja@montyprogram.com> | 2014-02-05 20:35:11 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2014-02-05 20:35:11 +0200 |
| commit | 52311b72e6aee3fec0dc13f4273138f7aeea7d71 (patch) | |
| tree | cea3548235426688ce80bd07a46c82c24c6ea58a /sql/sql_derived.cc | |
| parent | f68eac2eadb9bdb3d9c3554b37d6c253f04562d2 (diff) | |
| parent | bfdbb17990b198ff2a7e5eda5e2a365a1c6d8906 (diff) | |
| download | mariadb-git-52311b72e6aee3fec0dc13f4273138f7aeea7d71.tar.gz | |
merge 10.0-base ->10.0
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index ebd06a66f60..00ea0977a07 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -625,7 +625,7 @@ bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived) if ((res= sl->handle_derived(lex, DT_PREPARE))) goto exit; - if (derived->outer_join) + if (derived->outer_join && sl->first_cond_optimization) { /* Mark that table is part of OUTER JOIN and fields may be NULL */ for (TABLE_LIST *cursor= (TABLE_LIST*) sl->table_list.first; |