Merge remote-tracking branch 'origin/10.3' into 10.4

1 files changed, 1 insertions, 21 deletions

diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 13a823fb10d..d68603d4ea7 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -1093,19 +1093,6 @@ void Aggregator_distinct::endup()
 
 
 String *
-Item_sum_num::val_str(String *str)
-{
-  return val_string_from_real(str);
-}
-
-
-my_decimal *Item_sum_num::val_decimal(my_decimal *decimal_value)
-{
-  return val_decimal_from_real(decimal_value);
-}
-
-
-String *
 Item_sum_int::val_str(String *str)
 {
   return val_string_from_int(str);
@@ -2183,7 +2170,7 @@ double Stddev::result(bool is_sample_variance)
 
 
 Item_sum_variance::Item_sum_variance(THD *thd, Item_sum_variance *item):
-  Item_sum_num(thd, item),
+  Item_sum_double(thd, item),
     m_stddev(item->m_stddev), sample(item->sample),
     prec_increment(item->prec_increment)
 { }
@@ -2305,13 +2292,6 @@ double Item_sum_variance::val_real()
 }
 
 
-my_decimal *Item_sum_variance::val_decimal(my_decimal *dec_buf)
-{
-  DBUG_ASSERT(fixed == 1);
-  return val_decimal_from_real(dec_buf);
-}
-
-
 void Item_sum_variance::reset_field()
 {
   double nr;