merge with 3.23.56 to get patches for --lower-case-table-names and

proper handling of SUM() in some functions.

1 files changed, 11 insertions, 0 deletions

diff --git a/sql/item_func.cc b/sql/item_func.cc
index 02ae03b217f..ef629098d2a 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -971,6 +971,17 @@ longlong Item_func_field::val_int()
   return 0;
 }
 
+void Item_func_field::split_sum_func(List<Item> &fields)
+{
+  if (item->with_sum_func && item->type() != SUM_FUNC_ITEM)
+    item->split_sum_func(fields);
+  else if (item->used_tables() || item->type() == SUM_FUNC_ITEM)
+  {
+    fields.push_front(item);
+    item= new Item_ref((Item**) fields.head_ref(), 0, item->name);
+  }  
+  Item_func::split_sum_func(fields);
+}
 
 longlong Item_func_ascii::val_int()
 {