summaryrefslogtreecommitdiff
path: root/sql/sql_join_cache.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-09-12 16:51:41 +0200
committerSergei Golubchik <sergii@pisem.net>2014-09-12 16:51:41 +0200
commitc799d65bafe16eeef9eeaddc90a94e2a7fab1724 (patch)
tree711ef7f707616408000d82c29d2a2994783bc6ad /sql/sql_join_cache.cc
parent32360bb7289a5758a6abe12a84e9fd0ecc3d6ce4 (diff)
parent5023bb899dfaf78d85be2e6c08ec22cadcbcf82a (diff)
downloadmariadb-git-c799d65bafe16eeef9eeaddc90a94e2a7fab1724.tar.gz
5.3 merge
Diffstat (limited to 'sql/sql_join_cache.cc')
-rw-r--r--sql/sql_join_cache.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc
index e97f0e185c6..9411b3a92c8 100644
--- a/sql/sql_join_cache.cc
+++ b/sql/sql_join_cache.cc
@@ -2088,7 +2088,7 @@ enum_nested_loop_state JOIN_CACHE::join_records(bool skip_last)
goto finish;
if (outer_join_first_inner)
{
- if (next_cache)
+ if (next_cache && join_tab != join_tab->last_inner)
{
/*
Ensure that all matches for outer records from join buffer are to be