diff options
| author | Michael Widenius <monty@mysql.com> | 2009-11-16 17:34:08 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2009-11-16 17:34:08 +0200 |
| commit | 815b9fedefa59b2807a5736b60a89c5ed98178d1 (patch) | |
| tree | 159eca1f4fe3a921cdcb33f25eca32fa6271e094 /include/my_tree.h | |
| parent | 9dfe197da96e89994b598edd76dd0c3e8b5d2e0c (diff) | |
| download | mariadb-git-815b9fedefa59b2807a5736b60a89c5ed98178d1.tar.gz | |
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)
Diffstat (limited to 'include/my_tree.h')
| -rw-r--r-- | include/my_tree.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_tree.h b/include/my_tree.h index e387b25d431..ceeb849ad0c 100644 --- a/include/my_tree.h +++ b/include/my_tree.h @@ -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*); |