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 /mysql-test/r/count_distinct2.result | |
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 'mysql-test/r/count_distinct2.result')
-rw-r--r-- | mysql-test/r/count_distinct2.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/count_distinct2.result b/mysql-test/r/count_distinct2.result index b2bcf11a37c..b8330835332 100644 --- a/mysql-test/r/count_distinct2.result +++ b/mysql-test/r/count_distinct2.result @@ -70,3 +70,7 @@ count(distinct s,t) 5 count(distinct n1) count(distinct n2) 2 3 +count(distinct n2) n1 +1 NULL +1 1 +3 2 |