summaryrefslogtreecommitdiff
path: root/myisam/mi_page.c
diff options
context:
space:
mode:
authorunknown <igor@rurik.mysql.com>2003-06-30 09:41:41 -0700
committerunknown <igor@rurik.mysql.com>2003-06-30 09:41:41 -0700
commit80c1bba3a90e36dbcbc4ec35171f21508759e99b (patch)
tree44574656fb0c8810963e2afccae4c1d98fc12d0b /myisam/mi_page.c
parent0912871d6aeefe61dae1370ab9a1493341b9b4fc (diff)
downloadmariadb-git-80c1bba3a90e36dbcbc4ec35171f21508759e99b.tar.gz
Many files:
Added multiple key cache myisam/mi_page.c: Added multiple key cache myisam/mi_delete_all.c: Added multiple key cache myisam/mi_extra.c: Added multiple key cache myisam/mi_locking.c: Added multiple key cache myisam/mi_panic.c: Added multiple key cache myisam/mi_preload.c: Added multiple key cache myisam/mi_check.c: Added multiple key cache myisam/myisamchk.c: Added multiple key cache myisam/myisamlog.c: Added multiple key cache myisam/mi_close.c: Added multiple key cache myisam/mi_test1.c: Added multiple key cache myisam/mi_test2.c: Added multiple key cache myisam/mi_test3.c: Added multiple key cache isam/_page.c: Added multiple key cache isam/_locking.c: Added multiple key cache isam/panic.c: Added multiple key cache isam/close.c: Added multiple key cache isam/isamchk.c: Added multiple key cache isam/test2.c: Added multiple key cache isam/test3.c: Added multiple key cache mysys/mf_keycache.c: Added multiple key cache include/my_sys.h: Added multiple key cache
Diffstat (limited to 'myisam/mi_page.c')
-rw-r--r--myisam/mi_page.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/myisam/mi_page.c b/myisam/mi_page.c
index 49f3243e08d..eef65f03493 100644
--- a/myisam/mi_page.c
+++ b/myisam/mi_page.c
@@ -31,7 +31,8 @@ uchar *_mi_fetch_keypage(register MI_INFO *info, MI_KEYDEF *keyinfo,
DBUG_ENTER("_mi_fetch_keypage");
DBUG_PRINT("enter",("page: %ld",page));
- tmp=(uchar*) key_cache_read(info->s->kfile,page,(byte*) buff,
+ tmp=(uchar*) key_cache_read(dflt_keycache,
+ info->s->kfile,page,(byte*) buff,
(uint) keyinfo->block_length,
(uint) keyinfo->block_length,
return_buffer);
@@ -92,7 +93,8 @@ int _mi_write_keypage(register MI_INFO *info, register MI_KEYDEF *keyinfo,
length=keyinfo->block_length;
}
#endif
- DBUG_RETURN((key_cache_write(info->s->kfile,page,(byte*) buff,length,
+ DBUG_RETURN((key_cache_write(dflt_keycache,
+ info->s->kfile,page,(byte*) buff,length,
(uint) keyinfo->block_length,
(int) ((info->lock_type != F_UNLCK) ||
info->s->delay_key_write))));
@@ -112,7 +114,8 @@ int _mi_dispose(register MI_INFO *info, MI_KEYDEF *keyinfo, my_off_t pos)
info->s->state.key_del[keyinfo->block_size]=pos;
mi_sizestore(buff,old_link);
info->s->state.changed|= STATE_NOT_SORTED_PAGES;
- DBUG_RETURN(key_cache_write(info->s->kfile,pos,buff,
+ DBUG_RETURN(key_cache_write(dflt_keycache,
+ info->s->kfile,pos,buff,
sizeof(buff),
(uint) keyinfo->block_length,
(int) (info->lock_type != F_UNLCK)));
@@ -140,7 +143,8 @@ my_off_t _mi_new(register MI_INFO *info, MI_KEYDEF *keyinfo)
}
else
{
- if (!key_cache_read(info->s->kfile,pos,
+ if (!key_cache_read(dflt_keycache,
+ info->s->kfile,pos,
buff,
(uint) sizeof(buff),
(uint) keyinfo->block_length,0))