diff options
| author | monty@hundin.mysql.fi <> | 2001-10-02 05:53:00 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-10-02 05:53:00 +0300 |
| commit | 880026ccf667bf6e6adbd6cfa0abcf4268d68e4c (patch) | |
| tree | b029d516fe4b48e540f64b01492d64cf5d68ad2f /myisam/mi_rkey.c | |
| parent | b5622e11dd4122959ec3deeac12686ff573a4f77 (diff) | |
| download | mariadb-git-880026ccf667bf6e6adbd6cfa0abcf4268d68e4c.tar.gz | |
Cleaned up SSL documentation
Fixes for embedded server
Made key_cache more configurable
Fixed that one can change key blocksize in MyISAM
A lot of optimizations to make MyISAM slightly faster
Diffstat (limited to 'myisam/mi_rkey.c')
| -rw-r--r-- | myisam/mi_rkey.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/myisam/mi_rkey.c b/myisam/mi_rkey.c index 0df390412b9..86547d3ef04 100644 --- a/myisam/mi_rkey.c +++ b/myisam/mi_rkey.c @@ -27,7 +27,7 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len, { uchar *key_buff; MYISAM_SHARE *share=info->s; - uint pack_key_length; + uint pack_key_length, use_key_length, nextflag; DBUG_ENTER("mi_rkey"); DBUG_PRINT("enter",("base: %lx inx: %d search_flag: %d", info,inx,search_flag)); @@ -55,11 +55,17 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len, bmove(key_buff,key,key_len); } - if (_mi_readinfo(info,F_RDLCK,1)) + if (fast_mi_readinfo(info)) goto err; if (share->concurrent_insert) rw_rdlock(&share->key_root_lock[inx]); - if (!_mi_search(info,info->s->keyinfo+inx,key_buff,pack_key_length, + + nextflag=myisam_read_vec[search_flag]; + use_key_length=pack_key_length; + if (!(nextflag & (SEARCH_FIND | SEARCH_NO_FIND | SEARCH_LAST))) + use_key_length=USE_WHOLE_KEY; + + if (!_mi_search(info,info->s->keyinfo+inx,key_buff,use_key_length, myisam_read_vec[search_flag],info->s->state.key_root[inx])) { while (info->lastpos >= info->state->data_file_length) |