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_open.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_open.c')
| -rw-r--r-- | myisam/mi_open.c | 7 |
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 { |