diff options
| author | ram@mysql.r18.ru <> | 2003-03-05 16:07:12 +0400 |
|---|---|---|
| committer | ram@mysql.r18.ru <> | 2003-03-05 16:07:12 +0400 |
| commit | 008b9361bbed1ee3763ea405fd6b8992e19fc03b (patch) | |
| tree | 8b4286c6f146b7135cedd4c66e23861d70b71bbe /myisam/rt_index.c | |
| parent | 4f930a7c2a5bc25a9651f3340fc8e234a1f1383c (diff) | |
| download | mariadb-git-008b9361bbed1ee3763ea405fd6b8992e19fc03b.tar.gz | |
Bug fix: we should set proper my_errno
Diffstat (limited to 'myisam/rt_index.c')
| -rw-r--r-- | myisam/rt_index.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/myisam/rt_index.c b/myisam/rt_index.c index 131ab5bd0b7..e3f64940203 100644 --- a/myisam/rt_index.c +++ b/myisam/rt_index.c @@ -158,7 +158,10 @@ int rtree_find_first(MI_INFO *info, uint keynr, uchar *key, uint key_length, MI_KEYDEF *keyinfo = info->s->keyinfo + keynr; if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR) + { + my_errno= HA_ERR_END_OF_FILE; return -1; + } /* Save searched key */ memcpy(info->lastkey2, key, keyinfo->keylength - info->s->base.rec_reflength); @@ -217,7 +220,10 @@ int rtree_find_next(MI_INFO *info, uint keynr, uint search_flag) } } if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR) + { + my_errno= HA_ERR_END_OF_FILE; return -1; + } nod_cmp_flag = ((search_flag & (MBR_EQUAL | MBR_WITHIN)) ? MBR_WITHIN : MBR_INTERSECT); @@ -340,7 +346,10 @@ int rtree_get_first(MI_INFO *info, uint keynr, uint key_length) MI_KEYDEF *keyinfo = info->s->keyinfo + keynr; if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR) + { + my_errno= HA_ERR_END_OF_FILE; return -1; + } info->rtree_recursion_depth = -1; info->buff_used = 1; @@ -383,7 +392,10 @@ int rtree_get_next(MI_INFO *info, uint keynr, uint key_length) else { if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR) + { + my_errno= HA_ERR_END_OF_FILE; return -1; + } return rtree_get_req(info, &keyinfo[keynr], key_length, root, 0); } @@ -732,7 +744,7 @@ int rtree_delete(MI_INFO *info, uint keynr, uchar *key, uint key_length) if ((old_root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR) { - my_errno = HA_ERR_KEY_NOT_FOUND; + my_errno= HA_ERR_END_OF_FILE; return -1; } |