diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-09-25 16:35:57 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-09-25 16:35:57 +0500 |
| commit | feb9cc2f156de97233f345730a22c82ae51a0827 (patch) | |
| tree | 874a4f5932896fc52053e692eec6dfac12fbbf9c /myisam | |
| parent | 862187ef2a7951bf12fafe2336ff320a00c49fa9 (diff) | |
| parent | 032de81438179ebfc047e6eb6e3c505400f3bb18 (diff) | |
| download | mariadb-git-feb9cc2f156de97233f345730a22c82ae51a0827.tar.gz | |
Merge mysql.com:/home/hf/work/mysql-4.1.12991
into mysql.com:/home/hf/work/mysql-4.1.15428
myisam/mi_check.c:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_check.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index 65ce70a97df..301becf9c62 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -1153,9 +1153,12 @@ int chk_data_link(MI_CHECK *param, MI_INFO *info,int extend) /* We don't need to lock the key tree here as we don't allow concurrent threads when running myisamchk */ - int search_result= (keyinfo->flag & HA_SPATIAL) ? + int search_result= +#ifdef HAVE_RTREE_KEYS + (keyinfo->flag & HA_SPATIAL) ? rtree_find_first(info, key, info->lastkey, key_length, MBR_EQUAL | MBR_DATA) : +#endif _mi_search(info,keyinfo,info->lastkey,key_length, SEARCH_SAME, info->s->state.key_root[key]); if (search_result) |