From b7b7eb9c05f3036da3f90b5cad03a3b47d1f7aa2 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 12 May 2001 19:50:51 -0600 Subject: 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 --- mysql-test/r/count_distinct2.result | 4 ++++ mysql-test/t/count_distinct2.test | 3 +++ 2 files changed, 7 insertions(+) (limited to 'mysql-test') 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 diff --git a/mysql-test/t/count_distinct2.test b/mysql-test/t/count_distinct2.test index cfdce77622c..5ddd96198fe 100644 --- a/mysql-test/t/count_distinct2.test +++ b/mysql-test/t/count_distinct2.test @@ -40,3 +40,6 @@ select distinct s,t from t1; select count(distinct s,t) from t1; select count(distinct n1), count(distinct n2) from t1; + +select count(distinct n2), n1 from t1 group by n1; +drop table t1; -- cgit v1.2.1