post-merge fixes
This commit is contained in:
parent
c926bdc814
commit
c0c369f081
@ -324,8 +324,8 @@ uint _mi_ft_convert_to_ft2(MI_INFO *info, uint keynr, uchar *key)
|
|||||||
mi_putint(info->buff,length+2,0);
|
mi_putint(info->buff,length+2,0);
|
||||||
memcpy(info->buff+2, key_ptr, length);
|
memcpy(info->buff+2, key_ptr, length);
|
||||||
info->buff_used=info->page_changed=1; /* info->buff is used */
|
info->buff_used=info->page_changed=1; /* info->buff is used */
|
||||||
if ((root= _mi_new(info,keyinfo)) == HA_OFFSET_ERROR ||
|
if ((root= _mi_new(info,keyinfo,DFLT_INIT_HITS)) == HA_OFFSET_ERROR ||
|
||||||
_mi_write_keypage(info,keyinfo,root,info->buff))
|
_mi_write_keypage(info,keyinfo,root,DFLT_INIT_HITS,info->buff))
|
||||||
DBUG_RETURN(-1);
|
DBUG_RETURN(-1);
|
||||||
|
|
||||||
/* inserting the rest of key values */
|
/* inserting the rest of key values */
|
||||||
|
@ -725,15 +725,16 @@ int ha_myisam::assign_to_keycache(THD* thd, HA_CHECK_OPT *check_opt)
|
|||||||
/* Check validity of the index references */
|
/* Check validity of the index references */
|
||||||
if (!triggered && table_list->use_index)
|
if (!triggered && table_list->use_index)
|
||||||
{
|
{
|
||||||
key_map kmap= get_key_map_from_key_list(table, table_list->use_index);
|
key_map kmap;
|
||||||
if (kmap == ~(key_map) 0)
|
get_key_map_from_key_list(&kmap, table, table_list->use_index);
|
||||||
|
if (kmap.is_set_all())
|
||||||
{
|
{
|
||||||
errmsg= thd->net.last_error;
|
errmsg= thd->net.last_error;
|
||||||
error= HA_ADMIN_FAILED;
|
error= HA_ADMIN_FAILED;
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
if (kmap)
|
if (!kmap.is_clear_all())
|
||||||
map= kmap;
|
map= kmap.to_ulonglong();
|
||||||
}
|
}
|
||||||
|
|
||||||
len= strlen(new_key_cache_name);
|
len= strlen(new_key_cache_name);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user