diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-09-16 14:03:17 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-09-16 14:03:17 +0200 |
commit | 7e29c1b53968914f42300a7f628088b99601f4db (patch) | |
tree | d9b55e33bd83a02251cd8a3fe560ef149c7b21ca /sql/sql_join_cache.cc | |
parent | 1e3e81a6c9971a56c94086227aa438d133172863 (diff) | |
parent | 33656e042dc7e983c9612a011fdef64a8dd40aa1 (diff) | |
download | mariadb-git-7e29c1b53968914f42300a7f628088b99601f4db.tar.gz |
5.5 merge
Diffstat (limited to 'sql/sql_join_cache.cc')
-rw-r--r-- | sql/sql_join_cache.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc index cab9628837c..254b7026e96 100644 --- a/sql/sql_join_cache.cc +++ b/sql/sql_join_cache.cc @@ -2094,7 +2094,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 |