diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-10-10 17:28:11 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-10-10 17:28:11 +0400 |
| commit | c370208a4c01d8e6cd162561166beb8c586cfba3 (patch) | |
| tree | 139bfe9612b6adc9143c5882ca188937b0539bba /sql/item_sum.cc | |
| parent | a7f8da2904525096fd6cf9c7999ce087ee4d9d4d (diff) | |
| parent | e32f277c615c566d7b1654be473da40134693d96 (diff) | |
| download | mariadb-git-c370208a4c01d8e6cd162561166beb8c586cfba3.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21354
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21354
mysql-test/t/func_gconcat.test:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
mysql-test/r/ps.result:
Manual merge.
mysql-test/t/ps.test:
Manual merge.
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 73e2c5e6935..1c574cc872f 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1065,6 +1065,7 @@ longlong Item_sum_count::val_int() void Item_sum_count::cleanup() { DBUG_ENTER("Item_sum_count::cleanup"); + clear(); Item_sum_int::cleanup(); used_table_cache= ~(table_map) 0; DBUG_VOID_RETURN; |