summaryrefslogtreecommitdiff
path: root/myisam/mi_open.c
diff options
context:
space:
mode:
authorhf@deer.(none) <>2004-03-12 18:51:03 +0400
committerhf@deer.(none) <>2004-03-12 18:51:03 +0400
commitec457a96efea6ab8eb1111e1659b60af62f12032 (patch)
tree416c45416bcc8605ff5754473476ddabbd22fe2f /myisam/mi_open.c
parent6aa1cc4a6387ffdba81c4959259f3249643e8fe5 (diff)
downloadmariadb-git-ec457a96efea6ab8eb1111e1659b60af62f12032.tar.gz
WL#1163 To make spatial code optional
myisam spatial code isolated
Diffstat (limited to 'myisam/mi_open.c')
-rw-r--r--myisam/mi_open.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/myisam/mi_open.c b/myisam/mi_open.c
index 2c4661c4d3e..be3db2dc7ac 100644
--- a/myisam/mi_open.c
+++ b/myisam/mi_open.c
@@ -327,9 +327,14 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
}
if (share->keyinfo[i].flag & HA_SPATIAL)
{
+#ifdef HAVE_SPATIAL
uint sp_segs=SPDIMS*2;
share->keyinfo[i].seg=pos-sp_segs;
share->keyinfo[i].keysegs--;
+#else
+ my_errno=HA_ERR_UNSUPPORTED;
+ goto err;
+#endif
}
else if (share->keyinfo[i].flag & HA_FULLTEXT)
{
@@ -726,8 +731,10 @@ static void setup_key_functions(register MI_KEYDEF *keyinfo)
{
if (keyinfo->key_alg == HA_KEY_ALG_RTREE)
{
+#ifdef HAVE_RTREE_KEYS
keyinfo->ck_insert = rtree_insert;
keyinfo->ck_delete = rtree_delete;
+#endif
}
else
{