diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
| commit | 65ca700def99289cc31a7040537f5aa6e12bf485 (patch) | |
| tree | 97b3a07299b626c519da0e80c122b5b79b933914 /include/my_tree.h | |
| parent | 2ab57de38d13d927ddff2d51aed4af34e13998f5 (diff) | |
| parent | 6e5bcca7935d3c62f84bb640e5357664a210ee12 (diff) | |
| download | mariadb-git-65ca700def99289cc31a7040537f5aa6e12bf485.tar.gz | |
merge.
checkpoint.
does not compile.
Diffstat (limited to 'include/my_tree.h')
| -rw-r--r-- | include/my_tree.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/my_tree.h b/include/my_tree.h index 0958a37fb4c..b4f2c07c794 100644 --- a/include/my_tree.h +++ b/include/my_tree.h @@ -52,7 +52,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; @@ -62,13 +62,13 @@ 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*); void reset_tree(TREE*); - /* similar to delete tree, except we do not my_free() blocks in mem_root - */ + + /* similar to delete tree, except we do not my_free() blocks in mem_root */ #define is_tree_inited(tree) ((tree)->root != 0) /* Functions on leafs */ @@ -87,6 +87,7 @@ void *tree_search_next(TREE *tree, TREE_ELEMENT ***last_pos, int l_offs, int r_offs); ha_rows tree_record_pos(TREE *tree, const void *key, enum ha_rkey_function search_flag, void *custom_arg); +#define reset_free_element(tree) (tree)->free= 0 #define TREE_ELEMENT_EXTRA_SIZE (sizeof(TREE_ELEMENT) + sizeof(void*)) |