diff options
| author | unknown <thek@adventure.(none)> | 2007-08-17 16:59:20 +0200 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2007-08-17 16:59:20 +0200 |
| commit | c24600306c0a1ea67160bd33b7e1e3f9bbc5685a (patch) | |
| tree | 198a36726eb3b24b0e494e2d46e65c45b6b765a1 /sql/sql_cache.h | |
| parent | eac42d5ac0bb9b9f082c3008da9f55213c581845 (diff) | |
| parent | bd80048fdbcd828622858520ff69707056da6595 (diff) | |
| download | mariadb-git-c24600306c0a1ea67160bd33b7e1e3f9bbc5685a.tar.gz | |
Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269
into adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269
mysql-test/r/query_cache.result:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_cache.h:
Auto merged
mysql-test/t/query_cache.test:
Manual merge
Diffstat (limited to 'sql/sql_cache.h')
| -rw-r--r-- | sql/sql_cache.h | 8 |
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: |