diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-04-16 20:35:29 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-04-16 20:35:29 +0300 |
| commit | 48935d0536e28032a2ce021bd2c3e22ccf97cba7 (patch) | |
| tree | e3388f92b12d4fbdfc30361d0fcde4c8f490ff05 /sql/ha_innodb.h | |
| parent | df5ff1daeae5b07019afe4a0e820984d069071a6 (diff) | |
| parent | d4280aedcac74739511bfdc75cc8a25b0984ebd4 (diff) | |
| download | mariadb-git-48935d0536e28032a2ce021bd2c3e22ccf97cba7.tar.gz | |
merging
sql/ha_innodb.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_cache.h:
Auto merged
Diffstat (limited to 'sql/ha_innodb.h')
| -rw-r--r-- | sql/ha_innodb.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h index 56546e3e8d0..be1174added 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -168,6 +168,7 @@ class ha_innobase: public handler enum thr_lock_type lock_type); void init_table_handle_for_HANDLER(); longlong get_auto_increment(); + uint8 table_cache_type() { return HA_CACHE_TBL_ASKTRANSACT; } }; extern bool innodb_skip; @@ -207,6 +208,6 @@ int innobase_close_connection(THD *thd); int innobase_drop_database(char *path); int innodb_show_status(THD* thd); -my_bool innobase_query_caching_of_table_permitted(THD* thd, char* full_name, - uint full_name_len); +bool innobase_query_caching_of_table_permitted(THD* thd, char* full_name, + uint full_name_len); void innobase_release_temporary_latches(void* innobase_tid); |