diff options
| author | pem@mysql.com <> | 2003-12-01 16:14:40 +0100 |
|---|---|---|
| committer | pem@mysql.com <> | 2003-12-01 16:14:40 +0100 |
| commit | 6e717133c5e43d45f720dff9feb5e9ff58867876 (patch) | |
| tree | 024f2d18e3cf9f65db53f9f8c2d5413859781e16 /myisam/myisamdef.h | |
| parent | 82270288de9244ff2b1ae5a58d66add2a13d6e70 (diff) | |
| parent | f266cdabab538eeb87682af70d5e76652ee6387b (diff) | |
| download | mariadb-git-6e717133c5e43d45f720dff9feb5e9ff58867876.tar.gz | |
Merge 4.1 to 5.0
Diffstat (limited to 'myisam/myisamdef.h')
| -rw-r--r-- | myisam/myisamdef.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h index 20574e43ac3..3788eeca1e3 100644 --- a/myisam/myisamdef.h +++ b/myisam/myisamdef.h @@ -166,7 +166,7 @@ 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 *key_cache; /* ref to the current key cache */ + KEY_CACHE *key_cache; /* ref to the current key cache */ MI_DECODE_TREE *decode_trees; uint16 *decode_tables; int (*read_record)(struct st_myisam_info*, my_off_t, byte*); @@ -713,7 +713,7 @@ int thr_write_keys(MI_SORT_PARAM *sort_param); #ifdef THREAD pthread_handler_decl(thr_find_all_keys,arg); #endif -int flush_blocks(MI_CHECK *param, KEY_CACHE_HANDLE key_cache, File file); +int flush_blocks(MI_CHECK *param, KEY_CACHE *key_cache, File file); int sort_write_record(MI_SORT_PARAM *sort_param); int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages, ulong); |