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 | 31bf8b62ed593d74e6241deea079749de3187a2f (patch) | |
| tree | da26feecd7cbf846809f47cafec851ab3a897b7c /sql | |
| parent | 6938e7d1f055ab02a088e4f78e7bd5e4f061c9e9 (diff) | |
| download | mariadb-git-31bf8b62ed593d74e6241deea079749de3187a2f.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')
| -rw-r--r-- | sql/item_sum.cc | 4 | ||||
| -rw-r--r-- | sql/item_sum.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 3c5f1a23704..b6bbc12efd6 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +/* Copyright (C) 2000-2003 MySQL AB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -918,7 +918,7 @@ int dump_leaf(byte* key, uint32 count __attribute__((unused)), } -void Item_sum_count_distinct::no_rows_in_result() +Item_sum_count_distinct::~Item_sum_count_distinct() { if (table) free_tmp_table(current_thd, table); 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);} }; |