mirror of
https://github.com/MariaDB/server.git
synced 2026-04-25 01:35:31 +02:00
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
This commit is contained in:
commit
feb9cc2f15
1 changed files with 4 additions and 1 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue