merge 5.5 -> 10.0-base

1 files changed, 7 insertions, 7 deletions

diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index b0047fc641f..fe67c1e81d1 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -346,7 +346,7 @@ String *Item_func_sha2::val_str_ascii(String *str)
 
 void Item_func_sha2::fix_length_and_dec()
 {
-  set_persist_maybe_null(1);
+  maybe_null= 1;
   max_length = 0;
 
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
@@ -472,7 +472,7 @@ String *Item_func_aes_decrypt::val_str(String *str)
 void Item_func_aes_decrypt::fix_length_and_dec()
 {
    max_length=args[0]->max_length;
-   set_persist_maybe_null(1);
+   maybe_null= 1;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -2494,7 +2494,7 @@ void Item_func_elt::fix_length_and_dec()
     set_if_bigger(decimals,args[i]->decimals);
   }
   fix_char_length(char_length);
-  set_persist_maybe_null(1);			  // NULL if wrong first arg
+  maybe_null=1;					// NULL if wrong first arg
 }
 
 
@@ -2689,7 +2689,7 @@ void Item_func_repeat::fix_length_and_dec()
   else
   {
     max_length= MAX_BLOB_WIDTH;
-    set_persist_maybe_null(1);
+    maybe_null= 1;
   }
 }
 
@@ -2808,7 +2808,7 @@ void Item_func_rpad::fix_length_and_dec()
   else
   {
     max_length= MAX_BLOB_WIDTH;
-    set_persist_maybe_null(1);
+    maybe_null= 1;
   }
 }
 
@@ -2914,7 +2914,7 @@ void Item_func_lpad::fix_length_and_dec()
   else
   {
     max_length= MAX_BLOB_WIDTH;
-    set_persist_maybe_null(1);
+    maybe_null= 1;
   }
 }
 
@@ -3891,7 +3891,7 @@ bool Item_func_dyncol_create::fix_fields(THD *thd, Item **ref)
 
 void Item_func_dyncol_create::fix_length_and_dec()
 {
-  set_persist_maybe_null(1);
+  maybe_null= TRUE;
   collation.set(&my_charset_bin);
   decimals= 0;
 }