Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my41-bug23411

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my50-bug23411

1 files changed, 8 insertions, 1 deletions

diff --git a/sql/item_func.cc b/sql/item_func.cc
index a294bbd7a71..ca71701841b 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -105,7 +105,7 @@ Item_func::Item_func(THD *thd, Item_func *item)
 
 
 /*
-  Resolve references to table column for a function and it's argument
+  Resolve references to table column for a function and its argument
 
   SYNOPSIS:
   fix_fields()
@@ -1377,6 +1377,13 @@ void Item_func_mod::result_precision()
 }
 
 
+void Item_func_mod::fix_length_and_dec()
+{
+  Item_num_op::fix_length_and_dec();
+  maybe_null= 1;
+}
+
+
 double Item_func_neg::real_op()
 {
   double value= args[0]->val_real();