summaryrefslogtreecommitdiff
path: root/sql/handler.h
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2003-10-31 10:34:34 +0100
committerunknown <serg@serg.mylan>2003-10-31 10:34:34 +0100
commitb04629049af702ba4a4ce1b0dc2d4e5d2e698da1 (patch)
treee3649ecfe44ca927dd7369b8cd2116bb28646ad0 /sql/handler.h
parente9f308f0b91adb560c75f5d7e333c07949154e7d (diff)
parentff182082576e4c23fe5049597b2d5ae9b4158526 (diff)
downloadmariadb-git-b04629049af702ba4a4ce1b0dc2d4e5d2e698da1.tar.gz
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1 myisam/mi_check.c: Auto merged myisam/mi_delete.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisamdef.h: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/r/range.result: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_myisam.h: Auto merged sql/ha_myisammrg.cc: Auto merged sql/handler.h: Auto merged sql/item_cmpfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_test.cc: Auto merged sql/sql_yacc.yy: Auto merged
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 29dea7f213b..c24bf777f01 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -306,6 +306,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);