mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-09 16:44:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

manually merged

Browse source
This commit is contained in:
serg@serg.mylan 2004-08-18 19:57:55 +02:00
commit e1237cbc53
107 changed files with 995 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sql/item_sum.h
View file

@ -282,7 +282,11 @@ public:
class Item_sum_avg :public Item_sum_num
{
void fix_length_and_dec() { decimals+=4; maybe_null=1; }
void fix_length_and_dec()
{
decimals=min(decimals+4, NOT_FIXED_DEC);
maybe_null=1;
}
double sum;
ulonglong count;
@ -337,7 +341,11 @@ class Item_sum_variance : public Item_sum_num
{
double sum, sum_sqr;
ulonglong count;
void fix_length_and_dec() { decimals+=4; maybe_null=1; }
void fix_length_and_dec()
{
decimals=min(decimals+4, NOT_FIXED_DEC);
maybe_null=1;
}
public:
Item_sum_variance(Item *item_par) :Item_sum_num(item_par),count(0) {}