Merging

myisam/rt_index.c:
  Auto merged
myisam/rt_index.h:
  Auto merged
myisam/rt_mbr.c:
  Auto merged
myisam/rt_mbr.h:
  Auto merged
myisam/rt_split.c:
  Auto merged
myisam/rt_test.c:
  Auto merged
sql/spatial.cc:
  Auto merged

1 files changed, 5 insertions, 5 deletions

diff --git a/myisam/rt_split.c b/myisam/rt_split.c
index ccc4c0733f4..005e86805bb 100644
--- a/myisam/rt_split.c
+++ b/myisam/rt_split.c
@@ -267,12 +267,12 @@ int rtree_split_page(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *page, uchar *key,
 
   n_dim = keyinfo->keysegs / 2;
   
-  if (!my_multi_malloc(MYF(0),
-		       &coord_buf, n_dim * 2 * sizeof(double) * (max_keys + 1 + 4),
-		       &task, sizeof(SplitStruct) * (max_keys + 1),
-		       NullS))
+  if (!(coord_buf= my_alloca(n_dim * 2 * sizeof(double) * (max_keys + 1 + 4) +
+			     sizeof(SplitStruct) * (max_keys + 1))))
     return -1;
 
+  task= (SplitStruct *)(coord_buf + n_dim * 2 * (max_keys + 1 + 4));
+
   next_coord = coord_buf;
  
   stop = task + max_keys;
@@ -345,7 +345,7 @@ int rtree_split_page(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *page, uchar *key,
   my_afree((byte*)new_page);
 
 split_err:
-  my_free((gptr) coord_buf, MYF(0));
+  my_afree((byte*) coord_buf);
   return err_code;
 }