diff options
| author | unknown <hf@deer.(none)> | 2004-05-27 16:32:49 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-05-27 16:32:49 +0500 |
| commit | 7f49646cf3be49c0f9a9a9f8599e9bea2223e08a (patch) | |
| tree | 019f859000d45cddee40cd07a8a14076fcfa4c6f /myisam/mi_rnext.c | |
| parent | aa6ff1cf682437d3e083bc25617fdc57d3a149d3 (diff) | |
| parent | 805897cdb81f36b775eb4917f606afdef36c63a8 (diff) | |
| download | mariadb-git-7f49646cf3be49c0f9a9a9f8599e9bea2223e08a.tar.gz | |
Merging
myisam/mi_create.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/rt_test.c:
Auto merged
myisam/sp_test.c:
Auto merged
sql/spatial.cc:
Auto merged
sql/spatial.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
myisam/mi_range.c:
merging
myisam/mi_rnext.c:
merging
Diffstat (limited to 'myisam/mi_rnext.c')
| -rw-r--r-- | myisam/mi_rnext.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/myisam/mi_rnext.c b/myisam/mi_rnext.c index 6e6056f98d9..69bf5c8deae 100644 --- a/myisam/mi_rnext.c +++ b/myisam/mi_rnext.c @@ -45,9 +45,11 @@ int mi_rnext(MI_INFO *info, byte *buf, int inx) if (!flag) { switch(info->s->keyinfo[inx].key_alg){ +#ifdef HAVE_RTREE_KEYS case HA_KEY_ALG_RTREE: error=rtree_get_first(info,inx,info->lastkey_length); break; +#endif case HA_KEY_ALG_BTREE: default: error=_mi_search_first(info,info->s->keyinfo+inx, @@ -58,6 +60,7 @@ int mi_rnext(MI_INFO *info, byte *buf, int inx) else { switch (info->s->keyinfo[inx].key_alg) { +#ifdef HAVE_RTREE_KEYS case HA_KEY_ALG_RTREE: /* Note that rtree doesn't support that the table @@ -66,7 +69,7 @@ int mi_rnext(MI_INFO *info, byte *buf, int inx) */ error= rtree_get_next(info,inx,info->lastkey_length); break; - +#endif case HA_KEY_ALG_BTREE: default: if (!changed) |