summaryrefslogtreecommitdiff
path: root/sql/sql_join_cache.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2019-06-13 16:42:21 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2019-06-13 16:42:21 +0200
commit50653e021f1678c3c28c6b5886fadb9fcf8d87ff (patch)
tree1e0fa45c58e4405da192d7e7a41c39b0128e9b11 /sql/sql_join_cache.cc
parente9145aab44f3c052868836f2fe1b9ca87ae6895b (diff)
parent5b65d61d9384a45ea1b8df79694493fbb1a14e4a (diff)
downloadmariadb-git-50653e021f1678c3c28c6b5886fadb9fcf8d87ff.tar.gz
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sql_join_cache.cc')
-rw-r--r--sql/sql_join_cache.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc
index 2c4c68e3637..77017812074 100644
--- a/sql/sql_join_cache.cc
+++ b/sql/sql_join_cache.cc
@@ -2146,7 +2146,8 @@ enum_nested_loop_state JOIN_CACHE::join_records(bool skip_last)
}
finish:
- if (outer_join_first_inner)
+ if (outer_join_first_inner &&
+ join_tab->first_inner == join_tab->first_unmatched)
{
/*
All null complemented rows have been already generated for all