summaryrefslogtreecommitdiff
path: root/sql/sql_join_cache.h
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2011-04-30 04:59:05 +0400
committerSergey Petrunya <psergey@askmonty.org>2011-04-30 04:59:05 +0400
commit3098c21b8f8e01448e36620a28e4b4314e82077a (patch)
treeaffe5757ecef44b12d6bdbf906d24c63c4376291 /sql/sql_join_cache.h
parent2721e912ba45f42f3ddf7c8366f6abbeef060833 (diff)
parent81c6f73ff26c5f384c44e6c576a8024cd4910077 (diff)
downloadmariadb-git-3098c21b8f8e01448e36620a28e4b4314e82077a.tar.gz
Merge MWL#90 into 5.3-main
Diffstat (limited to 'sql/sql_join_cache.h')
-rw-r--r--sql/sql_join_cache.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/sql/sql_join_cache.h b/sql/sql_join_cache.h
index 920b7a507c1..f87cdcec649 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;