diff options
author | unknown <sanja@montyprogram.com> | 2014-01-28 23:23:14 +0200 |
---|---|---|
committer | unknown <sanja@montyprogram.com> | 2014-01-28 23:23:14 +0200 |
commit | 08293a35e663f79a95b9e6c719bd45b7c5870d57 (patch) | |
tree | 4a8e0ca77bc65b6722dcdcba5f941f5f034ecb21 /sql/sql_derived.cc | |
parent | 52340eee1a97165af937eb5db0b07ed00163a55e (diff) | |
download | mariadb-git-08293a35e663f79a95b9e6c719bd45b7c5870d57.tar.gz |
MDEV-5369: Wrong result (0 instead of NULL) on 2nd execution of PS with LEFT JOIN, TEMPTABLE view
Set of JOIN_TYPE_OUTER made only once to avoid interference with optimization joins which made only once per query.
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 f336d8f6b62..3243f0a0eff 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -627,7 +627,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; |