diff options
| author | unknown <serg@serg.mysql.com> | 2001-05-16 23:06:30 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-05-16 23:06:30 +0200 |
| commit | 89ec1da4fb9cb5d61f4c78e36092548a28c5dbac (patch) | |
| tree | 2a70f22e99c521af3c0c2174fd0bbf8ed02fa073 /myisammrg/myrg_rkey.c | |
| parent | b59b5f4b6ec6bd5b0eb8cee832b6d4f51fa646fc (diff) | |
| download | mariadb-git-89ec1da4fb9cb5d61f4c78e36092548a28c5dbac.tar.gz | |
Fulltext manual changed, MERGE bug fixed
Docs/manual.texi:
Fulltext manual changed, MERGE bug added to changelog
myisammrg/mymrgdef.h:
MERGE bug fixed
myisammrg/myrg_rkey.c:
MERGE bug fixed
myisammrg/myrg_rnext.c:
MERGE bug fixed
myisammrg/myrg_rprev.c:
MERGE bug fixed
mysql-test/r/merge.result:
MERGE bug fixed
mysql-test/t/merge.test:
MERGE bug fixed
Diffstat (limited to 'myisammrg/myrg_rkey.c')
| -rw-r--r-- | myisammrg/myrg_rkey.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/myisammrg/myrg_rkey.c b/myisammrg/myrg_rkey.c index 6560380622a..cd2c73c8ec2 100644 --- a/myisammrg/myrg_rkey.c +++ b/myisammrg/myrg_rkey.c @@ -44,7 +44,6 @@ int myrg_rkey(MYRG_INFO *info,byte *record,int inx, const byte *key, MYRG_TABLE *table; MI_INFO *mi; int err; - byte *buf=((search_flag == HA_READ_KEY_EXACT) ? record: 0); LINT_INIT(key_buff); LINT_INIT(pack_key_length); @@ -57,14 +56,14 @@ int myrg_rkey(MYRG_INFO *info,byte *record,int inx, const byte *key, if (table == info->open_tables) { - err=mi_rkey(mi,buf,inx,key,key_len,search_flag); + err=mi_rkey(mi,0,inx,key,key_len,search_flag); key_buff=(byte*) mi->lastkey+mi->s->base.max_key_length; pack_key_length=mi->last_rkey_length; } else { mi->use_packed_key=1; - err=mi_rkey(mi,buf,inx,key_buff,pack_key_length,search_flag); + err=mi_rkey(mi,0,inx,key_buff,pack_key_length,search_flag); mi->use_packed_key=0; } info->last_used_table=table+1; @@ -78,12 +77,6 @@ int myrg_rkey(MYRG_INFO *info,byte *record,int inx, const byte *key, /* adding to queue */ queue_insert(&(info->by_key),(byte *)table); - /* if looking for KEY_EXACT, return first matched now */ - if (buf) - { - info->current_table=table; - return 0; - } } if (!info->by_key.elements) |