summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <sergefp@mysql.com>2004-12-21 03:02:38 +0300
committerunknown <sergefp@mysql.com>2004-12-21 03:02:38 +0300
commit7f6cc1df6ef9a222c4533ce5ff79539cbd8fd7e6 (patch)
tree94753a05a1fa80497e40e9ce7412e1ec11bda646 /myisam
parentb4f4c5bd1c8642796e3b7e7a62142ce3a3070fee (diff)
parent7ea16212077eb53bdc8161af1d132deae8f030ff (diff)
downloadmariadb-git-7f6cc1df6ef9a222c4533ce5ff79539cbd8fd7e6.tar.gz
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-order-bug
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_rnext_same.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/myisam/mi_rnext_same.c b/myisam/mi_rnext_same.c
index 1342718d6aa..a50c578e081 100644
--- a/myisam/mi_rnext_same.c
+++ b/myisam/mi_rnext_same.c
@@ -88,6 +88,10 @@ int mi_rnext_same(MI_INFO *info, byte *buf)
if (my_errno == HA_ERR_KEY_NOT_FOUND)
my_errno=HA_ERR_END_OF_FILE;
}
+ else if (!buf)
+ {
+ DBUG_RETURN(info->lastpos==HA_OFFSET_ERROR ? my_errno : 0);
+ }
else if (!(*info->read_record)(info,info->lastpos,buf))
{
info->update|= HA_STATE_AKTIV; /* Record is read */