summaryrefslogtreecommitdiff
path: root/heap
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2002-03-07 13:57:52 +0200
committerunknown <Sinisa@sinisa.nasamreza.org>2002-03-07 13:57:52 +0200
commit0d50a93fb70941c375a253e5b4ce3e0bc8cc6a35 (patch)
tree8e32348440474ecc6dbf93fa85b3fe086d5eb8c6 /heap
parente578a2e23142b863db9c95ebe1d3459c84cfabfe (diff)
downloadmariadb-git-0d50a93fb70941c375a253e5b4ce3e0bc8cc6a35.tar.gz
better fix for a bug fix from yesterday
Diffstat (limited to 'heap')
-rw-r--r--heap/hp_rfirst.c5
-rw-r--r--heap/hp_rnext.c6
2 files changed, 5 insertions, 6 deletions
diff --git a/heap/hp_rfirst.c b/heap/hp_rfirst.c
index 9a1f09244a0..b20918ff3a7 100644
--- a/heap/hp_rfirst.c
+++ b/heap/hp_rfirst.c
@@ -21,6 +21,11 @@
int heap_rfirst(HP_INFO *info, byte *record)
{
DBUG_ENTER("heap_rfirst");
+ if (!(info->s->records))
+ {
+ my_errno=HA_ERR_END_OF_FILE;
+ DBUG_RETURN(my_errno);
+ }
info->current_record=0;
info->current_hash_ptr=0;
info->update=HA_STATE_PREV_FOUND;
diff --git a/heap/hp_rnext.c b/heap/hp_rnext.c
index 7a6b6846169..af08a0e68a2 100644
--- a/heap/hp_rnext.c
+++ b/heap/hp_rnext.c
@@ -24,12 +24,6 @@ int heap_rnext(HP_INFO *info, byte *record)
HP_SHARE *share=info->s;
DBUG_ENTER("heap_rnext");
- if (!(info->s->records))
- {
- my_errno=HA_ERR_END_OF_FILE;
- DBUG_RETURN(my_errno);
- }
-
if (info->lastinx < 0)
DBUG_RETURN(my_errno=HA_ERR_WRONG_INDEX);