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 | 070f03947e241c951f16388eee36f1060d55ee2f (patch) | |
| tree | 019f859000d45cddee40cd07a8a14076fcfa4c6f /myisam/mi_open.c | |
| parent | 194dae41f324edbe687213b97939c9ee2a4deefe (diff) | |
| parent | 42c627054b85b375cbbc296e04ece712b7e8dd6b (diff) | |
| download | mariadb-git-070f03947e241c951f16388eee36f1060d55ee2f.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_open.c')
| -rw-r--r-- | myisam/mi_open.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/myisam/mi_open.c b/myisam/mi_open.c index 53cf87b24b4..562227d2f03 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,12 @@ 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; +#else + DBUG_ASSERT(0); /* mi_open should check it never happens */ +#endif } else { |