diff options
| author | monty@mysql.com <> | 2003-11-20 22:06:25 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2003-11-20 22:06:25 +0200 |
| commit | 7c6113a39f56832da982cfb4ff191e9db49ca798 (patch) | |
| tree | 685b3a2a60fc00121d338cb0b5f84b4cd028bfe1 /isam/isamlog.c | |
| parent | ba659679e7816cd9c992c866645f65b06e5f69de (diff) | |
| download | mariadb-git-7c6113a39f56832da982cfb4ff191e9db49ca798.tar.gz | |
Merge key cache structures to one
Fixed compiler warnings (IRIX C compiler and VC++)
Diffstat (limited to 'isam/isamlog.c')
| -rw-r--r-- | isam/isamlog.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/isam/isamlog.c b/isam/isamlog.c index d8ea9d4ed80..75a35ef9704 100644 --- a/isam/isamlog.c +++ b/isam/isamlog.c @@ -329,8 +329,8 @@ static int examine_log(my_string file_name, char **table_names) bzero((gptr) com_count,sizeof(com_count)); init_tree(&tree,0,0,sizeof(file_info),(qsort_cmp2) file_info_compare,1, (tree_element_free) file_info_free, NULL); - VOID(init_key_cache(dflt_keycache,KEY_CACHE_BLOCK_SIZE,KEY_CACHE_SIZE, - &dflt_key_cache_var)); + VOID(init_key_cache(dflt_key_cache,KEY_CACHE_BLOCK_SIZE,KEY_CACHE_SIZE, + 0,0)); files_open=0; access_time=0; while (access_time++ != number_of_commands && !my_b_read(&cache,(byte*) head,9)) @@ -622,7 +622,7 @@ static int examine_log(my_string file_name, char **table_names) goto end; } } - end_key_cache(dflt_keycache,1); + end_key_cache(dflt_key_cache,1); delete_tree(&tree); VOID(end_io_cache(&cache)); VOID(my_close(file,MYF(0))); @@ -642,7 +642,7 @@ static int examine_log(my_string file_name, char **table_names) llstr(isamlog_filepos,llbuff))); fflush(stderr); end: - end_key_cache(dflt_keycache,1); + end_key_cache(dflt_key_cache,1); delete_tree(&tree); VOID(end_io_cache(&cache)); VOID(my_close(file,MYF(0))); |