diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-02-18 16:28:31 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-02-18 16:28:31 +0200 |
| commit | d4280aedcac74739511bfdc75cc8a25b0984ebd4 (patch) | |
| tree | e04887f1c891d0c36d16e22774a2d7b4bbea66ec /sql/ha_innodb.h | |
| parent | 49e6a2d0e443f5ba788026a6f9218db12ad23cc4 (diff) | |
| parent | 64236d3bddb4bd9f80e5ae01acb6b4f6db64ed97 (diff) | |
| download | mariadb-git-d4280aedcac74739511bfdc75cc8a25b0984ebd4.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-qc-4.1
mysql-test/r/innodb_cache.result:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_cache.cc:
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 86fb5d1947b..7022bed12e9 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,5 +208,5 @@ 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); |