mirror of
https://github.com/MariaDB/server.git
synced 2026-04-24 17:25:31 +02:00
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21354
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. sql/item_sum.h: Manual merge.
This commit is contained in:
commit
e32f277c61
5 changed files with 221 additions and 4 deletions
|
|
@ -1035,6 +1035,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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue