diff options
| author | unknown <igor@rurik.mysql.com> | 2003-10-01 20:16:36 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-10-01 20:16:36 -0700 |
| commit | c11cce1a18ad09ff73af5677e4abcc4b456c1010 (patch) | |
| tree | e1116ef7faa18e25e4ea484099e4c14d6fbbf7f1 /sql/ha_myisam.h | |
| parent | 6497f9d094e8a150803ba0e683e0fd78cf3813a4 (diff) | |
| parent | ed8dc87c00909daf7d96e563b4d4ca34b7dda0b2 (diff) | |
| download | mariadb-git-c11cce1a18ad09ff73af5677e4abcc4b456c1010.tar.gz | |
Manual merge after improving concurrency for key cache reassignment
include/myisam.h:
Auto merged
isam/isamchk.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_locking.c:
Auto merged
myisam/mi_search.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamlog.c:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysys/mf_keycache.c:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisam.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
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/ha_myisam.h')
| -rw-r--r-- | sql/ha_myisam.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/ha_myisam.h b/sql/ha_myisam.h index e4e3192af10..e8413ef0bd2 100644 --- a/sql/ha_myisam.h +++ b/sql/ha_myisam.h @@ -128,6 +128,7 @@ class ha_myisam: public handler int optimize(THD* thd, HA_CHECK_OPT* check_opt); int restore(THD* thd, HA_CHECK_OPT* check_opt); int backup(THD* thd, HA_CHECK_OPT* check_opt); + int assign_to_keycache(THD* thd, HA_CHECK_OPT* check_opt); int preload_keys(THD* thd, HA_CHECK_OPT* check_opt); #ifdef HAVE_REPLICATION int dump(THD* thd, int fd); |