diff options
| author | monty@narttu.mysql.fi <> | 2006-11-30 22:38:12 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2006-11-30 22:38:12 +0200 |
| commit | 430d215c58ba78a018ff1299cb537d66f41deaae (patch) | |
| tree | ed9e2b22ed77e3ea701164ea1905e9d4c8da0cf5 /include/my_tree.h | |
| parent | 0a673596a288505374b6232d4e17f08934829767 (diff) | |
| parent | 601e6f4b2a78921304bc1d779991c615ee229f89 (diff) | |
| download | mariadb-git-430d215c58ba78a018ff1299cb537d66f41deaae.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'include/my_tree.h')
| -rw-r--r-- | include/my_tree.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/my_tree.h b/include/my_tree.h index e9746ca1b2c..68a2ea777c0 100644 --- a/include/my_tree.h +++ b/include/my_tree.h @@ -51,7 +51,8 @@ typedef struct st_tree_element { 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,memory_limit,allocated; + uint offset_to_key,elements_in_tree,size_of_element; + ulong memory_limit, allocated; qsort_cmp2 compare; void *custom_arg; MEM_ROOT mem_root; @@ -61,7 +62,7 @@ typedef struct st_tree { } TREE; /* Functions on whole tree */ -void init_tree(TREE *tree, uint default_alloc_size, uint memory_limit, +void init_tree(TREE *tree, ulong default_alloc_size, ulong memory_limit, int size, qsort_cmp2 compare, my_bool with_delete, tree_element_free free_element, void *custom_arg); void delete_tree(TREE*); |