diff options
| author | unknown <igor@rurik.mysql.com> | 2003-06-30 09:41:41 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-06-30 09:41:41 -0700 |
| commit | 80c1bba3a90e36dbcbc4ec35171f21508759e99b (patch) | |
| tree | 44574656fb0c8810963e2afccae4c1d98fc12d0b /isam/_page.c | |
| parent | 0912871d6aeefe61dae1370ab9a1493341b9b4fc (diff) | |
| download | mariadb-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 'isam/_page.c')
| -rw-r--r-- | isam/_page.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/isam/_page.c b/isam/_page.c index 65733d66b77..fc150cf14bd 100644 --- a/isam/_page.c +++ b/isam/_page.c @@ -27,10 +27,11 @@ uchar *_nisam_fetch_keypage(register N_INFO *info, N_KEYDEF *keyinfo, my_off_t page, uchar *buff, int return_buffer) { uchar *tmp; - tmp=(uchar*) key_cache_read(info->s->kfile,page,(byte*) buff, - (uint) keyinfo->base.block_length, - (uint) keyinfo->base.block_length, - return_buffer); + tmp=(uchar*) key_cache_read(dflt_keycache, + info->s->kfile,page,(byte*) buff, + (uint) keyinfo->base.block_length, + (uint) keyinfo->base.block_length, + return_buffer); if (tmp == info->buff) { info->update|=HA_STATE_BUFF_SAVED; @@ -83,9 +84,10 @@ int _nisam_write_keypage(register N_INFO *info, register N_KEYDEF *keyinfo, length=keyinfo->base.block_length; } #endif - return (key_cache_write(info->s->kfile,page,(byte*) buff,length, - (uint) keyinfo->base.block_length, - (int) (info->lock_type != F_UNLCK))); + return (key_cache_write(dflt_keycache, + info->s->kfile,page,(byte*) buff,length, + (uint) keyinfo->base.block_length, + (int) (info->lock_type != F_UNLCK))); } /* nisam_write_keypage */ @@ -99,7 +101,8 @@ int _nisam_dispose(register N_INFO *info, N_KEYDEF *keyinfo, my_off_t pos) old_link=info->s->state.key_del[keynr]; info->s->state.key_del[keynr]=(ulong) pos; - DBUG_RETURN(key_cache_write(info->s->kfile,pos,(byte*) &old_link, + DBUG_RETURN(key_cache_write(dflt_keycache, + info->s->kfile,pos,(byte*) &old_link, sizeof(long), (uint) keyinfo->base.block_length, (int) (info->lock_type != F_UNLCK))); @@ -126,7 +129,8 @@ ulong _nisam_new(register N_INFO *info, N_KEYDEF *keyinfo) } else { - if (!key_cache_read(info->s->kfile,pos, + if (!key_cache_read(dflt_keycache, + info->s->kfile,pos, (byte*) &info->s->state.key_del[keynr], (uint) sizeof(long), (uint) keyinfo->base.block_length,0)) |