diff options
| author | unknown <serg@serg.mysql.com> | 2001-03-12 15:00:13 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-03-12 15:00:13 +0100 |
| commit | e183b27d79009bfc2081449ccd0e414d72710501 (patch) | |
| tree | bc562162fe2f86da098025b6b20dea9ba6f8e6c3 /myisammrg/myrg_rprev.c | |
| parent | 1c4c6b8aa7060e86f99af6970179938dcf4bf529 (diff) | |
| download | mariadb-git-e183b27d79009bfc2081449ccd0e414d72710501.tar.gz | |
myisammrg/myrg_rnext.c bug with incomlete queue fixed
myisammrg/myrg_rprev.c bug with incomlete queue fixed
myisammrg/myrg_rnext.c:
bug with incomlete queue fixed
myisammrg/myrg_rprev.c:
bug with incomlete queue fixed
Diffstat (limited to 'myisammrg/myrg_rprev.c')
| -rw-r--r-- | myisammrg/myrg_rprev.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/myisammrg/myrg_rprev.c b/myisammrg/myrg_rprev.c index 8d7a810696f..c63c73b4200 100644 --- a/myisammrg/myrg_rprev.c +++ b/myisammrg/myrg_rprev.c @@ -29,11 +29,7 @@ int myrg_rprev(MYRG_INFO *info, byte *buf, int inx) if ((err=mi_rprev(info->current_table->table,NULL,inx))) { if (err == HA_ERR_END_OF_FILE) - { queue_remove(&(info->by_key),0); - if (!info->by_key.elements) - return HA_ERR_END_OF_FILE; - } else return err; } @@ -48,6 +44,9 @@ int myrg_rprev(MYRG_INFO *info, byte *buf, int inx) if ((err=_myrg_finish_scan(info, inx, HA_READ_KEY_OR_PREV))) return err; + if (!info->by_key.elements) + return HA_ERR_END_OF_FILE; + /* now, mymerge's read_prev is as simple as one queue_top */ mi=(info->current_table=(MYRG_TABLE *)queue_top(&(info->by_key)))->table; return mi_rrnd(mi,buf,mi->lastpos); |