1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

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
This commit is contained in:
unknown
2007-08-17 16:59:20 +02:00
4 changed files with 78 additions and 7 deletions

View File

@ -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: