diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-10-10 18:11:10 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-10-10 18:11:10 +0400 |
| commit | bc5136244187543835d91eb7f98985fc69dad971 (patch) | |
| tree | f445a22e6778a0b2d19b2197ae28deabb03d4c48 /sql/item_sum.cc | |
| parent | f20d34f422cf828802454a42e6a3b3c40a6f6ba7 (diff) | |
| parent | e32f277c615c566d7b1654be473da40134693d96 (diff) | |
| download | mariadb-git-bc5136244187543835d91eb7f98985fc69dad971.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21354
mysql-test/t/func_gconcat.test:
Auto merged
sql/item_sum.cc:
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 5ca1dbba94b..513fa46ecb3 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1055,6 +1055,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; |