Commit 14b16d89 authored by holyfoot/hf@mysql.com/deer.(none)'s avatar holyfoot/hf@mysql.com/deer.(none)
Browse files

Merge mysql.com:/home/hf/work/mysql-4.1.12991

into  mysql.com:/home/hf/work/mysql-4.1.15428
parents 4a9cff00 668a57b1
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -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)