mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge chilla.local:/home/mydev/mysql-5.0-bug25673

Browse source 
into  chilla.local:/home/mydev/mysql-5.1-bug25673
This commit is contained in:
istruewing@chilla.local 2007-03-08 21:29:19 +01:00
commit 651b7b7fc1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/myisam/rt_index.c
View file

@ -632,14 +632,14 @@ static int rtree_insert_level(MI_INFO *info, uint keynr, uchar *key,
if ((old_root = info->s->state.key_root[keynr]) == 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;
mi_putint(info->buff, 2, 0);
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))
return 1;
DBUG_RETURN(1);
info->s->state.key_root[keynr] = old_root;
return res;
DBUG_RETURN(res);
}
switch ((res = rtree_insert_req(info, keyinfo, key, key_length,