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 | 7f49646cf3be49c0f9a9a9f8599e9bea2223e08a (patch) | |
tree | 019f859000d45cddee40cd07a8a14076fcfa4c6f /myisam/mi_range.c | |
parent | aa6ff1cf682437d3e083bc25617fdc57d3a149d3 (diff) | |
parent | 805897cdb81f36b775eb4917f606afdef36c63a8 (diff) | |
download | mariadb-git-7f49646cf3be49c0f9a9a9f8599e9bea2223e08a.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_range.c')
-rw-r--r-- | myisam/mi_range.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/myisam/mi_range.c b/myisam/mi_range.c index db01ada16dd..1e0fd42334e 100644 --- a/myisam/mi_range.c +++ b/myisam/mi_range.c @@ -65,6 +65,7 @@ ha_rows mi_records_in_range(MI_INFO *info, int inx, key_range *min_key, rw_rdlock(&info->s->key_root_lock[inx]); switch(info->s->keyinfo[inx].key_alg){ +#ifdef HAVE_RTREE_KEYS case HA_KEY_ALG_RTREE: { uchar * key_buff; @@ -79,6 +80,7 @@ ha_rows mi_records_in_range(MI_INFO *info, int inx, key_range *min_key, res= res ? res : 1; /* Don't return 0 */ break; } +#endif case HA_KEY_ALG_BTREE: default: start_pos= (min_key ? |