diff options
| author | unknown <msvensson@neptunus.homeip.net> | 2005-02-04 10:56:53 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.homeip.net> | 2005-02-04 10:56:53 +0100 |
| commit | 03bc59970610527a86a76ed5e8b993a6a3769d09 (patch) | |
| tree | c5a13a7369a48df8d68e09e6a1c49a02dc2841c2 /sql/sql_cache.cc | |
| parent | 2b0a3dbe9e935762db81f9d08721417584197ff4 (diff) | |
| download | mariadb-git-03bc59970610527a86a76ed5e8b993a6a3769d09.tar.gz | |
Merge of query cache from 4.1 to 5.0
mysql-test/r/ndb_cache.result:
Added 'order by' to select's
mysql-test/r/ndb_cache2.result:
Added 'order by' to select's
mysql-test/t/ndb_cache.test:
Added 'order by' to select's
mysql-test/t/ndb_cache2.test:
Added 'order by' to select's
sql/ha_innodb.h:
Changed function name
sql/ha_ndbcluster.cc:
Merge from query cache from 4.1 to 5.0
Added better comments
ndb_get_table_statistics had changed, so there where some adaptions to make
sql/ha_ndbcluster.h:
Changed name of function
sql/handler.h:
Changed name of function
sql/sql_cache.cc:
Changed name of function
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 68964d80bf7..e38e417e6df 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -2770,10 +2770,11 @@ my_bool Query_cache::ask_handler_allowance(THD *thd, for (; tables_used; tables_used= tables_used->next_global) { TABLE *table= tables_used->table; - if (!handler->cached_table_registration(thd, table->s->table_cache_key, - table->s->key_length, - &tables_used->callback_func, - &tables_used->engine_data)) + handler *handler= table->file; + if (!handler->register_query_cache_table(thd, table->s->table_cache_key, + table->s->key_length, + &tables_used->callback_func, + &tables_used->engine_data)) { DBUG_PRINT("qcache", ("Handler does not allow caching for %s.%s", tables_used->db, tables_used->alias)); |