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

proper handling of SUM() in some functions.



BitKeeper/etc/logging_ok:
  auto-union
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/group_by.result:
  merge with 3.23.56
mysql-test/t/group_by.test:
  merge with 3.23.56
sql/item_strfunc.h:
  merge with 3.23.56
sql/mysqld.cc:
  merge with 3.23.56
sql/sql_parse.cc:
  merge with 3.23.56
sql/sql_yacc.yy:
  merge with 3.23.56

1 files changed, 2 insertions, 0 deletions

diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index d9068e0e024..aaa15f415e7 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -184,6 +184,7 @@ public:
   {
     return (item->fix_fields(thd,tlist) || Item_func::fix_fields(thd,tlist));
   }
+  void split_sum_func(List<Item> &fields);
   void fix_length_and_dec();
   ~Item_func_interval() { delete item; }
   const char *func_name() const { return "interval"; }
@@ -273,6 +274,7 @@ public:
   const char *func_name() const { return "case"; }
   void print(String *str);
   bool fix_fields(THD *thd,struct st_table_list *tlist);
+  void split_sum_func(List<Item> &fields);
   Item *find_item(String *str);
   unsigned int size_of() { return sizeof(*this);}  
 };