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/ha_innodb.h | |
| 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/ha_innodb.h')
| -rw-r--r-- | sql/ha_innodb.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h index c5d501f3702..cca33cbbe1c 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -180,10 +180,10 @@ class ha_innobase: public handler /* ask handler about permission to cache table during query registration */ - my_bool cached_table_registration(THD *thd, char *table_key, - uint key_length, - qc_engine_callback *call_back, - ulonglong *engine_data) + my_bool register_query_cache_table(THD *thd, char *table_key, + uint key_length, + qc_engine_callback *call_back, + ulonglong *engine_data) { *call_back= innobase_query_caching_of_table_permitted; *engine_data= 0; |