summaryrefslogtreecommitdiff
path: root/sql/sql_cache.h
diff options
context:
space:
mode:
authorthek@adventure.(none) <>2007-08-17 16:59:20 +0200
committerthek@adventure.(none) <>2007-08-17 16:59:20 +0200
commit5d5519edde7bdcd39da70fc7d61e191bba2df32d (patch)
tree198a36726eb3b24b0e494e2d46e65c45b6b765a1 /sql/sql_cache.h
parenta8f5ca9f28cf1973a7af9ea3ee61c27dcd09c975 (diff)
parenta4248c2dd370fd7c64b4fa48085f55fd4fe41272 (diff)
downloadmariadb-git-5d5519edde7bdcd39da70fc7d61e191bba2df32d.tar.gz
Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269
into adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269
Diffstat (limited to 'sql/sql_cache.h')
-rw-r--r--sql/sql_cache.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/sql_cache.h b/sql/sql_cache.h
index c4c7e1dbc5e..4f7fb317e70 100644
--- a/sql/sql_cache.h
+++ b/sql/sql_cache.h
@@ -408,10 +408,12 @@ protected:
If query is cacheable return number tables in query
(query without tables not cached)
*/
- static
TABLE_COUNTER_TYPE is_cacheable(THD *thd, uint32 query_len, char *query,
- LEX *lex, TABLE_LIST *tables_used,
- uint8 *tables_type);
+ LEX *lex, TABLE_LIST *tables_used,
+ uint8 *tables_type);
+ TABLE_COUNTER_TYPE process_and_count_tables(THD *thd,
+ TABLE_LIST *tables_used,
+ uint8 *tables_type);
static my_bool ask_handler_allowance(THD *thd, TABLE_LIST *tables_used);
public: