diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-10-30 10:03:18 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-10-30 10:03:18 +0200 |
| commit | bba3b76cdbc5c6394997e460c1926ece5c7c11cd (patch) | |
| tree | 63cde2d4dfb618c600a2946792c8b57eeb94346f /sql | |
| parent | 09668c0124bef7666f2b8b66a23e9102580fcaf2 (diff) | |
| parent | ac37324843b97fc69c307f8bab52af69c81c1245 (diff) | |
| download | mariadb-git-bba3b76cdbc5c6394997e460c1926ece5c7c11cd.tar.gz | |
merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index cd4fe5d494a..3449692e41b 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -8964,7 +8964,10 @@ static void restore_prev_nj_state(JOIN_TAB *last) join->cur_embedding_map&= ~last_emb->nested_join->nj_map; else if (last_emb->nested_join->join_list.elements-1 == last_emb->nested_join->counter) + { join->cur_embedding_map|= last_emb->nested_join->nj_map; + break; + } else break; last_emb= last_emb->embedding; |