bzr commit into MySQL/Maria:mysql-maria branch (guilhem:2725)

[Guilhem Bichot]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-maria/ based on revid:serg@stripped

 2725 Guilhem Bichot	2009-01-26
      Putting back some fixes lost in a colleague's merge a while back; that was
      about problems when the R-tree index is not the first index.
modified:
  storage/maria/ma_rt_index.c
  storage/myisam/rt_index.c

=== modified file 'storage/maria/ma_rt_index.c'
--- a/storage/maria/ma_rt_index.c	2008-06-26 05:18:28 +0000
+++ b/storage/maria/ma_rt_index.c	2009-01-26 21:14:43 +0000
@@ -433,7 +433,7 @@ int maria_rtree_get_first(MARIA_HA *info
   info->maria_rtree_recursion_depth= -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);
 }
 
 

=== modified file 'storage/myisam/rt_index.c'
--- a/storage/myisam/rt_index.c	2008-10-10 15:28:41 +0000
+++ b/storage/myisam/rt_index.c	2009-01-26 21:14:43 +0000
@@ -378,6 +378,7 @@ err1:
 int rtree_get_first(MI_INFO *info, uint keynr, uint key_length)
 {
   my_off_t root;
+  MI_KEYDEF *keyinfo = info->s->keyinfo + keynr;
 
   if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
   {
@@ -388,7 +389,7 @@ int rtree_get_first(MI_INFO *info, uint 
   info->rtree_recursion_depth = -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);
 }