From 089d2e2ea39c13de7e84c40c4c087775379b8442 Mon Sep 17 00:00:00 2001
From: Sergey Petrunya <psergey@askmonty.org>
Date: Wed, 16 Feb 2011 00:59:02 +0300
Subject: Post-merge fixes part 2

---
 sql/sql_join_cache.cc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sql/sql_join_cache.cc')

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;
-- 
cgit v1.2.1