diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-02-10 17:03:27 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-02-10 17:03:27 +0200 |
| commit | 03865c5fb1ad3de32dd4fc85acdce48e18df67a4 (patch) | |
| tree | da26feecd7cbf846809f47cafec851ab3a897b7c /sql/item_sum.h | |
| parent | 7910884c5cbb59e89041506a12b9a3a567a97067 (diff) | |
| download | mariadb-git-03865c5fb1ad3de32dd4fc85acdce48e18df67a4.tar.gz | |
Better fix for count(distinct) bug
include/my_sys.h:
Remove compiler warning
mysql-test/mysql-test-run.sh:
Don't examine log files when you run with --extern
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index 62cb5974388..29ac1f1d1b1 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -185,7 +185,7 @@ class Item_sum_count_distinct :public Item_sum_int :Item_sum_int(list),table(0),used_table_cache(~(table_map) 0), tmp_table_param(0),use_tree(0),always_null(0) { quick_group=0; } - ~Item_sum_count_distinct() { no_rows_in_result(); } + ~Item_sum_count_distinct(); table_map used_tables() const { return used_table_cache; } enum Sumfunctype sum_func () const { return COUNT_DISTINCT_FUNC; } @@ -196,7 +196,7 @@ class Item_sum_count_distinct :public Item_sum_int void update_field(int offset) { return ; } // Never called const char *func_name() const { return "count_distinct"; } bool setup(THD *thd); - void no_rows_in_result(); + void no_rows_in_result() {} unsigned int size_of() { return sizeof(*this);} }; |