Commit 35d58191 authored by unknown's avatar unknown

Bug#25673 - spatial index corruption, error 126 incorrect key file for table

After backport fix.
Added forgotten DBUG_RETURNs, which was detected in 5.1 only.

parent 548a39a1
...@@ -636,14 +636,14 @@ static int rtree_insert_level(MI_INFO *info, uint keynr, uchar *key, ...@@ -636,14 +636,14 @@ static int rtree_insert_level(MI_INFO *info, uint keynr, uchar *key,
int res; int res;
if ((old_root = _mi_new(info, keyinfo, DFLT_INIT_HITS)) == HA_OFFSET_ERROR) if ((old_root = _mi_new(info, keyinfo, DFLT_INIT_HITS)) == HA_OFFSET_ERROR)
return -1; DBUG_RETURN(-1);
info->buff_used = 1; info->buff_used = 1;
mi_putint(info->buff, 2, 0); mi_putint(info->buff, 2, 0);
res = rtree_add_key(info, keyinfo, key, key_length, info->buff, NULL); res = rtree_add_key(info, keyinfo, key, key_length, info->buff, NULL);
if (_mi_write_keypage(info, keyinfo, old_root, DFLT_INIT_HITS, info->buff)) if (_mi_write_keypage(info, keyinfo, old_root, DFLT_INIT_HITS, info->buff))
return 1; DBUG_RETURN(1);
info->s->state.key_root[keynr] = old_root; info->s->state.key_root[keynr] = old_root;
return res; DBUG_RETURN(res);
} }
switch ((res = rtree_insert_req(info, keyinfo, key, key_length, switch ((res = rtree_insert_req(info, keyinfo, key, key_length,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment