summaryrefslogtreecommitdiff
path: root/myisam/mi_rkey.c
diff options
context:
space:
mode:
authorunknown <hf@deer.(none)>2004-03-12 18:51:03 +0400
committerunknown <hf@deer.(none)>2004-03-12 18:51:03 +0400
commit3bf2e442abf45f2a61f44f2b499b5a54eb116ac1 (patch)
tree416c45416bcc8605ff5754473476ddabbd22fe2f /myisam/mi_rkey.c
parent54042aa975b8ef37bf379942bb134f040246cf86 (diff)
downloadmariadb-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_rkey.c')
-rw-r--r--myisam/mi_rkey.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/myisam/mi_rkey.c b/myisam/mi_rkey.c
index ddfac0a39a2..12db00337ee 100644
--- a/myisam/mi_rkey.c
+++ b/myisam/mi_rkey.c
@@ -74,6 +74,7 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len,
use_key_length=USE_WHOLE_KEY;
switch (info->s->keyinfo[inx].key_alg) {
+#ifdef HAVE_RTREE_KEYS
case HA_KEY_ALG_RTREE:
if (rtree_find_first(info,inx,key_buff,use_key_length,nextflag) < 0)
{
@@ -81,6 +82,7 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len,
goto err;
}
break;
+#endif
case HA_KEY_ALG_BTREE:
default:
if (!_mi_search(info, keyinfo, key_buff, use_key_length,