Fix after merge.

sql/item_func.h

@@ -430,6 +430,7 @@ public:
   my_decimal *decimal_op(my_decimal *);
   const char *func_name() const { return "%"; }
   void result_precision();
+  void fix_length_and_dec();
 };