merge 10.0-base -> 10.0

1 files changed, 15 insertions, 17 deletions

diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 5c85c74ad52..582fa05b4a1 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -178,7 +178,7 @@ public:
   {
     collation.set(system_charset_info);
     max_length= MAX_BLOB_WIDTH;
-    set_persist_maybe_null(1);
+    maybe_null= 1;
   }
   const char *func_name() const { return "decode_histogram"; }
 };
@@ -400,7 +400,7 @@ public:
   String *val_str(String *);
   void fix_length_and_dec()
   {
-    set_persist_maybe_null(1);
+    maybe_null=1;
     /* 9 = MAX ((8- (arg_len % 8)) + 1) */
     max_length = args[0]->max_length + 9;
   }
@@ -416,7 +416,7 @@ public:
   String *val_str(String *);
   void fix_length_and_dec()
   {
-    set_persist_maybe_null(1);
+    maybe_null=1;
     /* 9 = MAX ((8- (arg_len % 8)) + 1) */
     max_length= args[0]->max_length;
     if (max_length >= 9U)
@@ -444,7 +444,7 @@ public:
     constructor_helper();
   }
   String *val_str(String *);
-  void fix_length_and_dec() { set_persist_maybe_null(1); max_length = 13; }
+  void fix_length_and_dec() { maybe_null=1; max_length = 13; }
   const char *func_name() const { return "encrypt"; }
   bool check_vcol_func_processor(uchar *int_arg) 
   {
@@ -514,7 +514,7 @@ public:
   void fix_length_and_dec()
   {
     max_length= MAX_FIELD_NAME * system_charset_info->mbmaxlen;
-    set_persist_maybe_null(1);
+    maybe_null=1;
   }
   const char *func_name() const { return "database"; }
   const char *fully_qualified_func_name() const { return "database()"; }
@@ -688,7 +688,7 @@ public:
   {
     collation.set(default_charset());
     max_length=64;
-    set_persist_maybe_null(1);
+    maybe_null= 1;
   }
 };
 
@@ -715,7 +715,7 @@ public:
   Item_func_unhex(Item *a) :Item_str_func(a) 
   { 
     /* there can be bad hex strings */
-    set_persist_maybe_null(1);
+    maybe_null= 1; 
   }
   const char *func_name() const { return "unhex"; }
   String *val_str(String *);
@@ -801,7 +801,7 @@ public:
   void fix_length_and_dec()
   {
     collation.set(&my_charset_bin, DERIVATION_COERCIBLE);
-    set_persist_maybe_null(1);
+    maybe_null=1;
     max_length=MAX_BLOB_WIDTH;
   }
   bool check_vcol_func_processor(uchar *int_arg) 
@@ -834,7 +834,7 @@ public:
   { 
     decimals= 0; 
     fix_length_and_charset(3 * 8 + 7, default_charset()); 
-    set_persist_maybe_null(1);
+    maybe_null= 1;
   }
 };
 
@@ -961,7 +961,7 @@ public:
   {
      collation.set(system_charset_info);
      max_length= 64 * collation.collation->mbmaxlen; // should be enough
-     set_persist_maybe_null(0);
+     maybe_null= 0;
   };
   table_map not_null_tables() const { return 0; }
 };
@@ -976,7 +976,7 @@ public:
   {
      collation.set(system_charset_info);
      max_length= 64 * collation.collation->mbmaxlen; // should be enough
-     set_persist_maybe_null(0);
+     maybe_null= 0;
   };
   table_map not_null_tables() const { return 0; }
 };
@@ -1022,8 +1022,7 @@ class Item_func_uncompress: public Item_str_func
   String buffer;
 public:
   Item_func_uncompress(Item *a): Item_str_func(a){}
-  void fix_length_and_dec()
-  { set_persist_maybe_null(1); max_length= MAX_BLOB_WIDTH; }
+  void fix_length_and_dec(){ maybe_null= 1; max_length= MAX_BLOB_WIDTH; }
   const char *func_name() const{return "uncompress";}
   String *val_str(String *) ZLIB_DEPENDED_FUNCTION
 };
@@ -1088,7 +1087,7 @@ public:
   String *val_str(String *);
   void fix_length_and_dec()
   {
-    set_persist_maybe_null(1);
+    maybe_null= 1;
     collation.set(&my_charset_bin);
     decimals= 0;
   }
@@ -1105,7 +1104,7 @@ public:
     :Item_str_func(str, num)
   {}
   void fix_length_and_dec()
-  { set_persist_maybe_null(1); max_length= MAX_BLOB_WIDTH; }
+  { maybe_null= 1;; max_length= MAX_BLOB_WIDTH; }
   /* Mark that collation can change between calls */
   bool dynamic_result() { return 1; }
 
@@ -1124,8 +1123,7 @@ class Item_func_dyncol_list: public Item_str_func
 {
 public:
   Item_func_dyncol_list(Item *str) :Item_str_func(str) {};
-  void fix_length_and_dec()
-  { set_persist_maybe_null(1); max_length= MAX_BLOB_WIDTH; };
+  void fix_length_and_dec() { maybe_null= 1; max_length= MAX_BLOB_WIDTH; };
   const char *func_name() const{ return "column_list"; }
   String *val_str(String *);
 };