diff options
author | serg@serg.mysql.com <> | 2002-12-04 10:47:51 +0100 |
---|---|---|
committer | serg@serg.mysql.com <> | 2002-12-04 10:47:51 +0100 |
commit | edb671e270cd6ddc8539cb560f4d06328548e3e0 (patch) | |
tree | 6bec22f7f3d10ffb5c5d3e5bb561e306fb7a0c01 /myisam | |
parent | 6dfd1d867e55dc8b77ea63ffc016b95fa7f23b95 (diff) | |
download | mariadb-git-edb671e270cd6ddc8539cb560f4d06328548e3e0.tar.gz |
post-merge fix
Diffstat (limited to 'myisam')
-rw-r--r-- | myisam/mi_rnext_same.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/myisam/mi_rnext_same.c b/myisam/mi_rnext_same.c index 662bdb154b3..a9d1953323c 100644 --- a/myisam/mi_rnext_same.c +++ b/myisam/mi_rnext_same.c @@ -27,14 +27,13 @@ int mi_rnext_same(MI_INFO *info, byte *buf) { int error; - uint inx,flag,not_used; + uint inx,not_used; MI_KEYDEF *keyinfo; DBUG_ENTER("mi_rnext_same"); if ((int) (inx=info->lastinx) < 0 || info->lastpos == HA_OFFSET_ERROR) DBUG_RETURN(my_errno=HA_ERR_WRONG_INDEX); keyinfo=info->s->keyinfo+inx; - flag=SEARCH_BIGGER; /* Read next */ if (fast_mi_readinfo(info)) DBUG_RETURN(my_errno); @@ -44,7 +43,7 @@ int mi_rnext_same(MI_INFO *info, byte *buf) for (;;) { if ((error=_mi_search_next(info,keyinfo,info->lastkey, - info->lastkey_length,flag, + info->lastkey_length,SEARCH_BIGGER, info->s->state.key_root[inx]))) break; if (_mi_key_cmp(keyinfo->seg,info->lastkey2,info->lastkey, |