summaryrefslogtreecommitdiff
path: root/myisam/myisamlog.c
diff options
context:
space:
mode:
authorigor@rurik.mysql.com <>2003-10-01 20:16:36 -0700
committerigor@rurik.mysql.com <>2003-10-01 20:16:36 -0700
commit17aecac32c44846209e0e77b9f18470862b8aed4 (patch)
treee1116ef7faa18e25e4ea484099e4c14d6fbbf7f1 /myisam/myisamlog.c
parent3bee8b429d82b9c5aa25b6585e249678f0c1b400 (diff)
parent8e5c62190f378ff6d57e44bd77536de868481af7 (diff)
downloadmariadb-git-17aecac32c44846209e0e77b9f18470862b8aed4.tar.gz
Manual merge after improving concurrency for key cache reassignment
Diffstat (limited to 'myisam/myisamlog.c')
-rw-r--r--myisam/myisamlog.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/myisam/myisamlog.c b/myisam/myisamlog.c
index ca164fcdaca..9b987364521 100644
--- a/myisam/myisamlog.c
+++ b/myisam/myisamlog.c
@@ -333,7 +333,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(KEY_CACHE_SIZE));
+ VOID(init_key_cache(dflt_keycache,KEY_CACHE_BLOCK_SIZE,KEY_CACHE_SIZE,
+ &dflt_key_cache_var));
files_open=0; access_time=0;
while (access_time++ != number_of_commands &&
@@ -647,7 +648,7 @@ static int examine_log(my_string file_name, char **table_names)
goto end;
}
}
- end_key_cache();
+ end_key_cache(dflt_keycache,1);
delete_tree(&tree);
VOID(end_io_cache(&cache));
VOID(my_close(file,MYF(0)));
@@ -667,7 +668,7 @@ static int examine_log(my_string file_name, char **table_names)
llstr(isamlog_filepos,llbuff)));
fflush(stderr);
end:
- end_key_cache();
+ end_key_cache(dflt_keycache,1);
delete_tree(&tree);
VOID(end_io_cache(&cache));
VOID(my_close(file,MYF(0)));