summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <serg@sergbook.mysql.com>2002-07-04 12:56:15 +0200
committerunknown <serg@sergbook.mysql.com>2002-07-04 12:56:15 +0200
commit2154f43e4d311fe6c19083a2b1499ed348da708d (patch)
tree536e3706135f43cef1140abde1dcfe9cc2ce9810
parent4637db42cbf37d5442a0144afe379742f23d5951 (diff)
parentf2b8c87d89d33353819158a3db535a320f01cfdb (diff)
downloadmariadb-git-2154f43e4d311fe6c19083a2b1499ed348da708d.tar.gz
Merge work:/home/bk/mysql
into sergbook.mysql.com:/usr/home/serg/Abk/mysql
-rw-r--r--myisammrg/myrg_rnext.c3
-rw-r--r--myisammrg/myrg_rprev.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/myisammrg/myrg_rnext.c b/myisammrg/myrg_rnext.c
index 5a3fbdfb299..703ca29632b 100644
--- a/myisammrg/myrg_rnext.c
+++ b/myisammrg/myrg_rnext.c
@@ -25,6 +25,9 @@ int myrg_rnext(MYRG_INFO *info, byte *buf, int inx)
int err;
MI_INFO *mi;
+ if (!info->current_table)
+ return (HA_ERR_KEY_NOT_FOUND);
+
/* at first, do rnext for the table found before */
if ((err=mi_rnext(info->current_table->table,NULL,inx)))
{
diff --git a/myisammrg/myrg_rprev.c b/myisammrg/myrg_rprev.c
index d8089e80498..8c43b40035a 100644
--- a/myisammrg/myrg_rprev.c
+++ b/myisammrg/myrg_rprev.c
@@ -25,6 +25,9 @@ int myrg_rprev(MYRG_INFO *info, byte *buf, int inx)
int err;
MI_INFO *mi;
+ if (!info->current_table)
+ return (HA_ERR_KEY_NOT_FOUND);
+
/* at first, do rprev for the table found before */
if ((err=mi_rprev(info->current_table->table,NULL,inx)))
{