summaryrefslogtreecommitdiff
path: root/sql/sql_join_cache.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2011-02-16 00:59:02 +0300
committerSergey Petrunya <psergey@askmonty.org>2011-02-16 00:59:02 +0300
commit089d2e2ea39c13de7e84c40c4c087775379b8442 (patch)
tree36255d9fcb978ebe83e3a1f4b4d482ec866cbf59 /sql/sql_join_cache.cc
parent7e5795fe04960e0916de6f9c349d62b7a6372e81 (diff)
downloadmariadb-git-089d2e2ea39c13de7e84c40c4c087775379b8442.tar.gz
Post-merge fixes part 2
Diffstat (limited to 'sql/sql_join_cache.cc')
-rw-r--r--sql/sql_join_cache.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc
index 5f3aa7e16e8..58cbb3fd1ca 100644
--- a/sql/sql_join_cache.cc
+++ b/sql/sql_join_cache.cc
@@ -235,6 +235,10 @@ psergey-merge: was:
}
}
start_tab= tab;
+ while (start_tab->bush_children && start_tab != join_tab)
+ start_tab++;
+ tab= start_tab;
+
//tables= join_tab-tab;
//tables= 0;
fields= 0;