From 64e63131f83ee70b2d0176323ad320ee76edff78 Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.org>
Date: Fri, 14 Apr 2017 21:27:33 +0400
Subject: [PATCH] Moving implementation of Item_hybrid_func::fix_attributes()
 from item_cmpfunc.cc to item_func.cc

---
 sql/item_cmpfunc.cc | 8 --------
 sql/item_func.cc    | 9 +++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index f5ba6f206c2..6d2135db91e 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -3315,14 +3315,6 @@ my_decimal *Item_func_coalesce::decimal_op(my_decimal *decimal_value)
 }
 
 
-bool Item_hybrid_func::fix_attributes(Item **items, uint nitems)
-{
-  bool rc= Item_hybrid_func::type_handler()->
-             Item_hybrid_func_fix_attributes(current_thd, this, items, nitems);
-  DBUG_ASSERT(!rc || current_thd->is_error());
-  return rc;
-}
-
 /****************************************************************************
  Classes and function for the IN operator
 ****************************************************************************/
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 03d0b1068a2..a52c2609412 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -543,6 +543,15 @@ my_decimal *Item_func::val_decimal(my_decimal *decimal_value)
 }
 
 
+bool Item_hybrid_func::fix_attributes(Item **items, uint nitems)
+{
+  bool rc= Item_hybrid_func::type_handler()->
+             Item_hybrid_func_fix_attributes(current_thd, this, items, nitems);
+  DBUG_ASSERT(!rc || current_thd->is_error());
+  return rc;
+}
+
+
 String *Item_real_func::val_str(String *str)
 {
   DBUG_ASSERT(fixed == 1);