summaryrefslogtreecommitdiff
path: root/sql/handler.h
diff options
context:
space:
mode:
authorunknown <igor@rurik.mysql.com>2003-10-01 20:20:17 -0700
committerunknown <igor@rurik.mysql.com>2003-10-01 20:20:17 -0700
commit09e7be1d821831eee3bdeb0126a92aa7c23bed7d (patch)
tree1e1f87443b0524fc4518025161bb250daa10cb18 /sql/handler.h
parent7c7ee4d2f4ae29df2167b0ca0e9ab6dfd93a1c07 (diff)
downloadmariadb-git-09e7be1d821831eee3bdeb0126a92aa7c23bed7d.tar.gz
Manual merge after improving concurrency for key cache reassignment
Diffstat (limited to 'sql/handler.h')
-rw-r--r--sql/handler.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/handler.h b/sql/handler.h
index b74e06c6edf..1fcc0da24f8 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -307,6 +307,7 @@ public:
virtual bool check_and_repair(THD *thd) {return 1;}
virtual int optimize(THD* thd,HA_CHECK_OPT* check_opt);
virtual int analyze(THD* thd, HA_CHECK_OPT* check_opt);
+ virtual int assign_to_keycache(THD* thd, HA_CHECK_OPT* check_opt);
virtual int preload_keys(THD* thd, HA_CHECK_OPT* check_opt);
virtual int backup(THD* thd, HA_CHECK_OPT* check_opt);
/*
@@ -389,8 +390,10 @@ int ha_create_table(const char *name, HA_CREATE_INFO *create_info,
bool update_create_info);
int ha_delete_table(enum db_type db_type, const char *path);
void ha_drop_database(char* path);
-void ha_key_cache(void);
-void ha_resize_key_cache(void);
+int ha_key_cache(KEY_CACHE_VAR *key_cache);
+int ha_resize_key_cache(KEY_CACHE_VAR *key_cache);
+int ha_change_key_cache_param(KEY_CACHE_VAR *key_cache);
+int ha_end_key_cache(KEY_CACHE_VAR *key_cache);
int ha_start_stmt(THD *thd);
int ha_report_binlog_offset_and_commit(THD *thd, char *log_file_name,
my_off_t end_offset);