diff options
| author | holyfoot/hf@mysql.com/deer.(none) <> | 2006-09-25 16:35:57 +0500 |
|---|---|---|
| committer | holyfoot/hf@mysql.com/deer.(none) <> | 2006-09-25 16:35:57 +0500 |
| commit | 14b16d89d99daad1e601af0cdd5b66200e108b5e (patch) | |
| tree | 874a4f5932896fc52053e692eec6dfac12fbbf9c | |
| parent | 4a9cff00c5db95b6dedbab127bca4d1f5f12e468 (diff) | |
| parent | 668a57b10a2556f1d90de54b71cc379b536ca965 (diff) | |
| download | mariadb-git-14b16d89d99daad1e601af0cdd5b66200e108b5e.tar.gz | |
Merge mysql.com:/home/hf/work/mysql-4.1.12991
into mysql.com:/home/hf/work/mysql-4.1.15428
| -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) |