1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

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

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

View File

@@ -51,7 +51,7 @@ typedef struct st_tree {
TREE_ELEMENT *root,null_element;
TREE_ELEMENT **parents[MAX_TREE_HEIGHT];
uint offset_to_key,elements_in_tree,size_of_element;
ulong memory_limit, allocated;
size_t memory_limit, allocated;
qsort_cmp2 compare;
void *custom_arg;
MEM_ROOT mem_root;
@@ -61,7 +61,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, size_t memory_limit,
int size, qsort_cmp2 compare, my_bool with_delete,
tree_element_free free_element, void *custom_arg);
void delete_tree(TREE*);