database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

Browse Source 
into  chilla.local:/home/mydev/mysql-5.0-bug25673


myisam/rt_index.c:
  Auto merged
This commit is contained in:
unknown
2007-03-08 19:23:36 +01:00
parent 2157f64238 35d5819129
commit 86589331ce
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
myisam/rt_index.c
View File

@ -634,14 +634,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,