Merge branch 'mysql-5.5' into mysql-5.6

Nisha Gopalakrishnan · Nisha Gopalakrishnan · commit ab892e59a5ca · 2016-03-17T09:00:22.000+05:30
diff --git a/include/my_tree.h b/include/my_tree.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -62,7 +62,7 @@ typedef struct st_tree {
 } TREE;
 
 	/* Functions on whole tree */
-void init_tree(TREE *tree, ulong default_alloc_size, ulong memory_limit,
+void init_tree(TREE *tree, size_t default_alloc_size, ulong memory_limit,
                int size, qsort_cmp2 compare, my_bool with_delete,
 	       tree_element_free free_element, const void *custom_arg);
 void delete_tree(TREE*);
diff --git a/mysys/tree.c b/mysys/tree.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -83,7 +83,7 @@ static void rb_delete_fixup(TREE *tree,TREE_ELEMENT ***parent);
 static int test_rb_tree(TREE_ELEMENT *element);
 #endif
 
-void init_tree(TREE *tree, ulong default_alloc_size, ulong memory_limit,
+void init_tree(TREE *tree, size_t default_alloc_size, ulong memory_limit,
                int size, qsort_cmp2 compare, my_bool with_delete,
 	       tree_element_free free_element, const void *custom_arg)
 {
@@ -127,7 +127,7 @@ void init_tree(TREE *tree, ulong default_alloc_size, ulong memory_limit,
   }
   if (!(tree->with_delete=with_delete))
   {
-    init_alloc_root(&tree->mem_root, (uint) default_alloc_size, 0);
+    init_alloc_root(&tree->mem_root, default_alloc_size, 0);
     tree->mem_root.min_malloc=(sizeof(TREE_ELEMENT)+tree->size_of_element);
   }
   DBUG_VOID_RETURN;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.`
	`1`	`+/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.`
`2`	`2`
`3`	`3`	`This program is free software; you can redistribute it and/or modify`
`4`	`4`	`it under the terms of the GNU General Public License as published by`
`@@ -83,7 +83,7 @@ static void rb_delete_fixup(TREE tree,TREE_ELEMENT **parent);`
`83`	`83`	`static int test_rb_tree(TREE_ELEMENT *element);`
`84`	`84`	`#endif`
`85`	`85`
`86`		`-void init_tree(TREE *tree, ulong default_alloc_size, ulong memory_limit,`
	`86`	`+void init_tree(TREE *tree, size_t default_alloc_size, ulong memory_limit,`
`87`	`87`	`int size, qsort_cmp2 compare, my_bool with_delete,`
`88`	`88`	`tree_element_free free_element, const void *custom_arg)`
`89`	`89`	`{`
`@@ -127,7 +127,7 @@ void init_tree(TREE *tree, ulong default_alloc_size, ulong memory_limit,`
`127`	`127`	`}`
`128`	`128`	`if (!(tree->with_delete=with_delete))`
`129`	`129`	`{`
`130`		`- init_alloc_root(&tree->mem_root, (uint) default_alloc_size, 0);`
	`130`	`+ init_alloc_root(&tree->mem_root, default_alloc_size, 0);`
`131`	`131`	`tree->mem_root.min_malloc=(sizeof(TREE_ELEMENT)+tree->size_of_element);`
`132`	`132`	`}`
`133`	`133`	`DBUG_VOID_RETURN;`