VladPolskiy/MariaDB-open-code
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-15 22:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Safety change to ensure read/black trees (used with heap tables) works on 64 bit setups where ulong <> size_t

Browse Source 
Don't retry test cases by default
Fixed bug where we could (under unlikely error conditions) access not initialized variable

include/my_tree.h:
  Safety change to ensure read/black trees (used with heap tables) works on 64 bit setups where ulong <> size_t
  (Pointed out by Bryan Aker)
mysql-test/mysql-test-run.pl:
  Don't retry test cases by default
  This makes it too easy to miss failures and we have anyway to fix race conditions, not ignore them.
mysys/tree.c:
  Safety change to ensure read/black trees (used with heap tables) works on 64 bit setups where ulong <> size_t
sql/sql_delete.cc:
  Fixed bug where we could (under unlikely error conditions) access not initialized variable.
  (Pointed out by Bryan Aker)
This commit is contained in:
Michael Widenius
2009-11-16 17:34:08 +02:00
parent 9dfe197da9
commit 815b9fedef
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysys/tree.c
View File

@ -77,13 +77,13 @@ static void rb_insert(TREE *tree,TREE_ELEMENT ***parent,
static void rb_delete_fixup(TREE *tree,TREE_ELEMENT ***parent);
/* The actuall code for handling binary trees */
/* The actual code for handling binary trees */
#ifndef DBUG_OFF
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, size_t memory_limit,
int size, qsort_cmp2 compare, my_bool with_delete,
tree_element_free free_element, void *custom_arg)
{
@ -96,7 +96,7 @@ void init_tree(TREE *tree, ulong default_alloc_size, ulong memory_limit,
bzero((uchar*) &tree->null_element,sizeof(tree->null_element));
tree->root= &tree->null_element;
tree->compare=compare;
tree->size_of_element=size > 0 ? (uint) size : 0;
tree->size_of_element= size > 0 ? (uint) size : 0;
tree->memory_limit=memory_limit;
tree->free=free_element;
tree->allocated=0;
@ -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;