diff options
author | unknown <sasha@mysql.sashanet.com> | 2001-05-12 19:50:51 -0600 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2001-05-12 19:50:51 -0600 |
commit | b7b7eb9c05f3036da3f90b5cad03a3b47d1f7aa2 (patch) | |
tree | 9a5be3c1de61f22213e62a51418e4cb6820cdc33 /include/my_tree.h | |
parent | 64984296241873f90e39d744b59690c7b3b408bb (diff) | |
download | mariadb-git-b7b7eb9c05f3036da3f90b5cad03a3b47d1f7aa2.tar.gz |
option to free_root() to not my_free() the blocks
fixed bug/updated count_distinct2 test
changed reset in count distinct to avoid calls to my_free()
include/my_sys.h:
option to free_root() not to do my_free()
include/my_tree.h:
reset_tree()
mysql-test/r/count_distinct2.result:
added group by test
mysql-test/t/count_distinct2.test:
group by test + fixed bug - need to drop table
mysys/my_alloc.c:
mark_blocks_free()
mysys/tree.c:
reset_tree()
sql/item_sum.cc:
in count distinct reset_tree instead of delete_tree
Diffstat (limited to 'include/my_tree.h')
-rw-r--r-- | include/my_tree.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/my_tree.h b/include/my_tree.h index d4d28644a39..be95e3ff4d2 100644 --- a/include/my_tree.h +++ b/include/my_tree.h @@ -62,6 +62,9 @@ void init_tree(TREE *tree,uint default_alloc_size, int element_size, qsort_cmp2 compare, my_bool with_delete, void (*free_element)(void*)); void delete_tree(TREE*); +void reset_tree(TREE*); + /* 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 */ |