diff options
| author | unknown <thek@adventure.(none)> | 2007-08-17 17:26:38 +0200 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2007-08-17 17:26:38 +0200 |
| commit | 59c92e263a44b234df4fbf1282bb2ce7b24a73b2 (patch) | |
| tree | 69c18f3b9d67f4b630d6931017af4fbc6294bfee /sql/sql_cache.h | |
| parent | d811750fe890293970be9cd8d7b73258dd280da5 (diff) | |
| parent | c24600306c0a1ea67160bd33b7e1e3f9bbc5685a (diff) | |
| download | mariadb-git-59c92e263a44b234df4fbf1282bb2ce7b24a73b2.tar.gz | |
Merge adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_cache.h:
Auto merged
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 645807eecbf..b47e2e9a43b 100644 --- a/sql/sql_cache.h +++ b/sql/sql_cache.h @@ -409,10 +409,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: |