bzr commit into mysql-6.0-bka-preview branch (igor:2655) Bug#35835

[Igor Babaev]

#At file:///home/igor/dev-bzr/mysql-6.0-bug35835/

 2655 Igor Babaev	2008-10-17
      Correction for the patch to fix bug #35835.
modified:
  sql/sql_select.cc

per-file messages:
  sql/sql_select.cc
    Correction for the patch to fix bug #35835.
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2008-10-15 01:19:02 +0000
+++ b/sql/sql_select.cc	2008-10-18 06:23:35 +0000
@@ -8394,7 +8394,8 @@ bool check_join_cache_usage(JOIN_TAB *ta
     if (first_inner != tab && !first_inner->use_join_cache)
       goto no_join_cache;
   }
-  if (tab->first_sj_inner_tab && !tab->first_sj_inner_tab->use_join_cache)
+  if (tab->first_sj_inner_tab && tab->first_sj_inner_tab != tab &&
+      !tab->first_sj_inner_tab->use_join_cache)
     goto no_join_cache;
   if (!tab[-1].use_join_cache)
   {