1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Putting back some fixes lost in a colleague's merge a while back; that was

Browse Source 
about problems when the R-tree index is not the first index.
This commit is contained in:
Guilhem Bichot 2009-01-26 22:14:43 +01:00
parent 9aa2ada9d0
commit 45f7a93914
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/maria/ma_rt_index.c
View File

@ -433,7 +433,7 @@ int maria_rtree_get_first(MARIA_HA *info, uint keynr, uint key_length)
info->maria_rtree_recursion_depth= -1; info->maria_rtree_recursion_depth= -1;
info->keyread_buff_used= 1; info->keyread_buff_used= 1;
return maria_rtree_get_req(info, &keyinfo[keynr], key_length, root, 0); return maria_rtree_get_req(info, keyinfo, key_length, root, 0);
} }

3
storage/myisam/rt_index.c
View File

@ -378,6 +378,7 @@ err1:
int rtree_get_first(MI_INFO *info, uint keynr, uint key_length) int rtree_get_first(MI_INFO *info, uint keynr, uint key_length)
{ {
my_off_t root; my_off_t root;
MI_KEYDEF *keyinfo = info->s->keyinfo + keynr;
if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR) if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
{ {
@ -388,7 +389,7 @@ int rtree_get_first(MI_INFO *info, uint keynr, uint key_length)
info->rtree_recursion_depth = -1; info->rtree_recursion_depth = -1;
info->buff_used = 1; info->buff_used = 1;
return rtree_get_req(info, info->s->keyinfo, key_length, root, 0); return rtree_get_req(info, keyinfo, key_length, root, 0);
} }