Merge MWL#90 with main 5.3 tree

1 files changed, 7 insertions, 6 deletions

diff --git a/sql/sql_join_cache.h b/sql/sql_join_cache.h
index 5498192122f..ad8641cf0cd 100644
--- a/sql/sql_join_cache.h
+++ b/sql/sql_join_cache.h
@@ -121,11 +121,14 @@ protected:
   */   
   JOIN *join;  
 
-  /* 
-    Cardinality of the range of join tables whose fields can be put into the
-    cache. A table from the range not necessarily contributes to the cache.
+  /*
+    JOIN_TAB of the first table that can have it's fields in the join cache. 
+    That is, tables in the [start_tab, tab) range can have their fields in the
+    join cache. 
+    If a join tab in the range represents an SJM-nest, then all tables from the
+    nest can have their fields in the join cache, too.
   */
-  uint tables;
+  JOIN_TAB *start_tab;
 
   /* 
     The total number of flag and data fields that can appear in a record
@@ -647,8 +650,6 @@ public:
     buff= 0;
   }   
   
-  JOIN_TAB *get_next_table(JOIN_TAB *tab);
-  
   friend class JOIN_CACHE_HASHED;
   friend class JOIN_CACHE_BNL;
   friend class JOIN_CACHE_BKA;