diff options
author | igor@rurik.mysql.com <> | 2003-10-30 10:45:28 -0800 |
---|---|---|
committer | igor@rurik.mysql.com <> | 2003-10-30 10:45:28 -0800 |
commit | f29ed57531b99b09a81b6f68b570ef3a5a26d865 (patch) | |
tree | bfd8508896ec045400e82650920bcfd37e53a8f1 /myisam/myisamdef.h | |
parent | 2dadbb3153f7d2f98f4ef37f7758e59e3959a831 (diff) | |
parent | f17ff0bc39135b417a3a120dbb59d5a9389d8221 (diff) | |
download | mariadb-git-f29ed57531b99b09a81b6f68b570ef3a5a26d865.tar.gz |
Merge
Diffstat (limited to 'myisam/myisamdef.h')
-rw-r--r-- | myisam/myisamdef.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h index 9844bb7b36d..fe9cd151c57 100644 --- a/myisam/myisamdef.h +++ b/myisam/myisamdef.h @@ -166,6 +166,8 @@ typedef struct st_mi_isam_share { /* Shared between opens */ char *data_file_name, /* Resolved path names from symlinks */ *index_file_name; byte *file_map; /* mem-map of file if possible */ + KEY_CACHE_HANDLE *keycache; /* ref to the current key cache */ + KEY_CACHE_HANDLE *reg_keycache; /* ref to the registered key cache */ MI_DECODE_TREE *decode_trees; uint16 *decode_tables; int (*read_record)(struct st_myisam_info*, my_off_t, byte*); @@ -546,11 +548,12 @@ extern int _mi_search_next(MI_INFO *info,MI_KEYDEF *keyinfo,uchar *key, extern int _mi_search_first(MI_INFO *info,MI_KEYDEF *keyinfo,my_off_t pos); extern int _mi_search_last(MI_INFO *info,MI_KEYDEF *keyinfo,my_off_t pos); extern uchar *_mi_fetch_keypage(MI_INFO *info,MI_KEYDEF *keyinfo,my_off_t page, - uchar *buff,int return_buffer); + int level,uchar *buff,int return_buffer); extern int _mi_write_keypage(MI_INFO *info,MI_KEYDEF *keyinfo,my_off_t page, - uchar *buff); -extern int _mi_dispose(MI_INFO *info,MI_KEYDEF *keyinfo,my_off_t pos); -extern my_off_t _mi_new(MI_INFO *info,MI_KEYDEF *keyinfo); + int level, uchar *buff); +extern int _mi_dispose(MI_INFO *info,MI_KEYDEF *keyinfo,my_off_t pos, + int level); +extern my_off_t _mi_new(MI_INFO *info,MI_KEYDEF *keyinfo,int level); extern uint _mi_make_key(MI_INFO *info,uint keynr,uchar *key, const byte *record,my_off_t filepos); extern uint _mi_pack_key(MI_INFO *info,uint keynr,uchar *key,uchar *old, |