Merge mysql.com:/home/hf/work/31758/my41-31758

into  mysql.com:/home/hf/work/31758/my50-31758

1 files changed, 3 insertions, 2 deletions

diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 04d1997e879..7607ebfc761 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -584,7 +584,8 @@ public:
   void fix_length_and_dec()
   {
     collation.set(default_charset());
-    max_length= 64;
+    max_length=64;
+    maybe_null= 1;
   }
 };
 
@@ -682,7 +683,7 @@ public:
     }
   String* val_str(String* str);
   const char *func_name() const { return "inet_ntoa"; }
-  void fix_length_and_dec() { decimals = 0; max_length=3*8+7; }
+  void fix_length_and_dec() { decimals = 0; max_length=3*8+7; maybe_null=1;}
 };
 
 class Item_func_quote :public Item_str_func