diff options
| author | unknown <kostja@bodhi.local> | 2006-11-02 03:24:11 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-11-02 03:24:11 +0300 |
| commit | 26085b7a91de8f1aca2f1bb53db901e7dc8ec528 (patch) | |
| tree | 770159509e06fd6a18a7522f82ea24cd83f9b4bb /sql/item_sum.cc | |
| parent | a262c4586c65aa392600c7ff7ac6334ade6f43f4 (diff) | |
| parent | 8d174b9e988f6e952c0068cba1b4d20e79f7b58a (diff) | |
| download | mariadb-git-26085b7a91de8f1aca2f1bb53db901e7dc8ec528.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
mysql-test/r/ps.result:
SCCS merged
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 c656faa7c49..b2ff62028c1 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"); + count= 0; Item_sum_int::cleanup(); used_table_cache= ~(table_map) 0; DBUG_VOID_RETURN; |