diff options
| author | unknown <hf@deer.(none)> | 2004-03-12 18:51:03 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-03-12 18:51:03 +0400 |
| commit | 3bf2e442abf45f2a61f44f2b499b5a54eb116ac1 (patch) | |
| tree | 416c45416bcc8605ff5754473476ddabbd22fe2f /myisam/mi_rnext.c | |
| parent | 54042aa975b8ef37bf379942bb134f040246cf86 (diff) | |
| download | mariadb-git-3bf2e442abf45f2a61f44f2b499b5a54eb116ac1.tar.gz | |
WL#1163 To make spatial code optional
myisam spatial code isolated
myisam/mi_create.c:
spatial code ifdef-ed
myisam/mi_key.c:
spatial code ifdef-ed
myisam/mi_open.c:
spatial code ifdef-ed
myisam/mi_range.c:
spatial code ifdef-ed
myisam/mi_rkey.c:
spatial code ifdef-ed
myisam/mi_rnext.c:
spatial code ifdef-ed
myisam/mi_rnext_same.c:
spatial code ifdef-ed
myisam/rt_index.c:
spatial code ifdef-ed
myisam/rt_index.h:
spatial code ifdef-ed
myisam/rt_key.c:
spatial code ifdef-ed
myisam/rt_key.h:
spatial code ifdef-ed
myisam/rt_mbr.c:
spatial code ifdef-ed
myisam/rt_mbr.h:
spatial code ifdef-ed
myisam/rt_split.c:
spatial code ifdef-ed
myisam/rt_test.c:
spatial code ifdef-ed
myisam/sp_defs.h:
spatial code ifdef-ed
myisam/sp_key.c:
spatial code ifdef-ed
myisam/sp_test.c:
spatial code ifdef-ed
sql/spatial.cc:
spatial code ifdef-ed
sql/spatial.h:
spatial code ifdef-ed
sql/sql_yacc.yy:
wrong error messages fixed
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 e1cf916d6d9..3e87785154d 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, @@ -59,6 +61,7 @@ int mi_rnext(MI_INFO *info, byte *buf, int inx) { 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 @@ -67,7 +70,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) |