manually merged

1 files changed, 10 insertions, 2 deletions

diff --git a/sql/item_sum.h b/sql/item_sum.h
index 507a36194de..fcace9e322a 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -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) {}