Merge remote-tracking branch 'origin/10.3' into 10.4

1 files changed, 115 insertions, 77 deletions

diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index eb084c3f58d..29af0b43d9d 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -144,9 +144,10 @@ class Item_func_md5 :public Item_str_ascii_checksum_func
 public:
   Item_func_md5(THD *thd, Item *a): Item_str_ascii_checksum_func(thd, a) {}
   String *val_str_ascii(String *);
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
     fix_length_and_charset(32, default_charset());
+    return FALSE;
   }
   const char *func_name() const { return "md5"; }
   Item *get_copy(THD *thd)
@@ -159,7 +160,7 @@ class Item_func_sha :public Item_str_ascii_checksum_func
 public:
   Item_func_sha(THD *thd, Item *a): Item_str_ascii_checksum_func(thd, a) {}
   String *val_str_ascii(String *);    
-  void fix_length_and_dec();      
+  bool fix_length_and_dec();
   const char *func_name() const { return "sha"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_sha>(thd, this); }
@@ -171,7 +172,7 @@ public:
   Item_func_sha2(THD *thd, Item *a, Item *b)
    :Item_str_ascii_checksum_func(thd, a, b) {}
   String *val_str_ascii(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "sha2"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_sha2>(thd, this); }
@@ -184,7 +185,7 @@ public:
   Item_func_to_base64(THD *thd, Item *a)
    :Item_str_ascii_checksum_func(thd, a) {}
   String *val_str_ascii(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "to_base64"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_to_base64>(thd, this); }
@@ -197,7 +198,7 @@ public:
   Item_func_from_base64(THD *thd, Item *a)
    :Item_str_binary_checksum_func(thd, a) { }
   String *val_str(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "from_base64"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_from_base64>(thd, this); }
@@ -224,7 +225,7 @@ class Item_func_aes_encrypt :public Item_aes_crypt
 public:
   Item_func_aes_encrypt(THD *thd, Item *a, Item *b)
    :Item_aes_crypt(thd, a, b) {}
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "aes_encrypt"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_aes_encrypt>(thd, this); }
@@ -235,7 +236,7 @@ class Item_func_aes_decrypt :public Item_aes_crypt
 public:
   Item_func_aes_decrypt(THD *thd, Item *a, Item *b):
     Item_aes_crypt(thd, a, b) {}
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "aes_decrypt"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_aes_decrypt>(thd, this); }
@@ -259,7 +260,7 @@ public:
   Item_func_concat(THD *thd, List<Item> &list): Item_str_func(thd, list) {}
   Item_func_concat(THD *thd, Item *a, Item *b): Item_str_func(thd, a, b) {}
   String *val_str(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "concat"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_concat>(thd, this); }
@@ -294,11 +295,12 @@ public:
   Item_func_decode_histogram(THD *thd, Item *a, Item *b):
     Item_str_func(thd, a, b) {}
   String *val_str(String *);
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
     collation.set(system_charset_info);
     max_length= MAX_BLOB_WIDTH;
     maybe_null= 1;
+    return FALSE;
   }
   const char *func_name() const { return "decode_histogram"; }
   Item *get_copy(THD *thd)
@@ -311,7 +313,7 @@ class Item_func_concat_ws :public Item_str_func
 public:
   Item_func_concat_ws(THD *thd, List<Item> &list): Item_str_func(thd, list) {}
   String *val_str(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "concat_ws"; }
   table_map not_null_tables() const { return 0; }
   Item *get_copy(THD *thd)
@@ -324,7 +326,7 @@ class Item_func_reverse :public Item_str_func
 public:
   Item_func_reverse(THD *thd, Item *a): Item_str_func(thd, a) {}
   String *val_str(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "reverse"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_reverse>(thd, this); }
@@ -338,7 +340,7 @@ public:
   Item_func_replace(THD *thd, Item *org, Item *find, Item *replace):
     Item_str_func(thd, org, find, replace) {}
   String *val_str(String *to) { return val_str_internal(to, NULL); };
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   String *val_str_internal(String *str, String *empty_string_for_null);
   const char *func_name() const { return "replace"; }
   Item *get_copy(THD *thd)
@@ -378,7 +380,7 @@ public:
   }
   String *val_str(String *str);
   bool fix_fields(THD *thd, Item **ref);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "regexp_replace"; }
   Item *get_copy(THD *thd) { return 0;}
 };
@@ -400,7 +402,7 @@ public:
   }
   String *val_str(String *str);
   bool fix_fields(THD *thd, Item **ref);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "regexp_substr"; }
   Item *get_copy(THD *thd) { return 0; }
 };
@@ -414,7 +416,7 @@ public:
                    Item *new_str):
     Item_str_func(thd, org, start, length, new_str) {}
   String *val_str(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "insert"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_insert>(thd, this); }
@@ -438,7 +440,7 @@ class Item_func_lcase :public Item_str_conv
 public:
   Item_func_lcase(THD *thd, Item *item): Item_str_conv(thd, item) {}
   const char *func_name() const { return "lcase"; }
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_lcase>(thd, this); }
 };
@@ -448,7 +450,7 @@ class Item_func_ucase :public Item_str_conv
 public:
   Item_func_ucase(THD *thd, Item *item): Item_str_conv(thd, item) {}
   const char *func_name() const { return "ucase"; }
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_ucase>(thd, this); }
 };
@@ -460,7 +462,7 @@ class Item_func_left :public Item_str_func
 public:
   Item_func_left(THD *thd, Item *a, Item *b): Item_str_func(thd, a, b) {}
   String *val_str(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "left"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_left>(thd, this); }
@@ -473,7 +475,7 @@ class Item_func_right :public Item_str_func
 public:
   Item_func_right(THD *thd, Item *a, Item *b): Item_str_func(thd, a, b) {}
   String *val_str(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "right"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_right>(thd, this); }
@@ -490,7 +492,7 @@ public:
   Item_func_substr(THD *thd, Item *a, Item *b, Item *c):
     Item_str_func(thd, a, b, c) {}
   String *val_str(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "substr"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_substr>(thd, this); }
@@ -508,10 +510,11 @@ public:
     Item_func_substr(thd, a, b) {}
   Item_func_substr_oracle(THD *thd, Item *a, Item *b, Item *c):
     Item_func_substr(thd, a, b, c) {}
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
-    Item_func_substr::fix_length_and_dec();
+    bool res= Item_func_substr::fix_length_and_dec();
     maybe_null= true;
+    return res;
   }
   const char *func_name() const { return "substr_oracle"; }
   Item *get_copy(THD *thd)
@@ -525,7 +528,7 @@ public:
   Item_func_substr_index(THD *thd, Item *a,Item *b,Item *c):
     Item_str_func(thd, a, b, c) {}
   String *val_str(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "substring_index"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_substr_index>(thd, this); }
@@ -561,7 +564,7 @@ public:
   Item_func_trim(THD *thd, Item *a, Item *b): Item_str_func(thd, a, b) {}
   Item_func_trim(THD *thd, Item *a): Item_str_func(thd, a) {}
   String *val_str(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "trim"; }
   void print(String *str, enum_query_type query_type);
   virtual const char *mode_name() const { return "both"; }
@@ -581,10 +584,11 @@ public:
     Item_func_trim(thd, a, b) {}
   Item_func_trim_oracle(THD *thd, Item *a): Item_func_trim(thd, a) {}
   const char *func_name() const { return "trim_oracle"; }
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
-    Item_func_trim::fix_length_and_dec();
+    bool res= Item_func_trim::fix_length_and_dec();
     maybe_null= true;
+    return res;
   }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_trim_oracle>(thd, this); }
@@ -615,10 +619,11 @@ public:
     Item_func_ltrim(thd, a, b) {}
   Item_func_ltrim_oracle(THD *thd, Item *a): Item_func_ltrim(thd, a) {}
   const char *func_name() const { return "ltrim_oracle"; }
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
-    Item_func_ltrim::fix_length_and_dec();
+    bool res= Item_func_ltrim::fix_length_and_dec();
     maybe_null= true;
+    return res;
   }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_ltrim_oracle>(thd, this); }
@@ -649,10 +654,11 @@ public:
     Item_func_rtrim(thd, a, b) {}
   Item_func_rtrim_oracle(THD *thd, Item *a): Item_func_rtrim(thd, a) {}
   const char *func_name() const { return "rtrim_oracle"; }
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
-    Item_func_rtrim::fix_length_and_dec();
+    bool res= Item_func_rtrim::fix_length_and_dec();
     maybe_null= true;
+    return res;
   }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_rtrim_oracle>(thd, this); }
@@ -681,12 +687,13 @@ public:
     Item_str_ascii_checksum_func(thd, a), alg(al), deflt(0) {}
   String *val_str_ascii(String *str);
   bool fix_fields(THD *thd, Item **ref);
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
     fix_length_and_charset((alg == 1 ?
                             SCRAMBLED_PASSWORD_CHAR_LENGTH :
                             SCRAMBLED_PASSWORD_CHAR_LENGTH_323),
                            default_charset());
+    return FALSE;
   }
   const char *func_name() const { return ((deflt || alg == 1) ?
                                           "password" : "old_password"); }
@@ -707,11 +714,12 @@ public:
   Item_func_des_encrypt(THD *thd, Item *a, Item *b)
    :Item_str_binary_checksum_func(thd, a, b) {}
   String *val_str(String *);
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
     maybe_null=1;
     /* 9 = MAX ((8- (arg_len % 8)) + 1) */
     max_length = args[0]->max_length + 9;
+    return FALSE;
   }
   const char *func_name() const { return "des_encrypt"; }
   Item *get_copy(THD *thd)
@@ -727,13 +735,14 @@ public:
   Item_func_des_decrypt(THD *thd, Item *a, Item *b)
    :Item_str_binary_checksum_func(thd, a, b) {}
   String *val_str(String *);
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
     maybe_null=1;
     /* 9 = MAX ((8- (arg_len % 8)) + 1) */
     max_length= args[0]->max_length;
     if (max_length >= 9U)
       max_length-= 9U;
+    return FALSE;
   }
   const char *func_name() const { return "des_decrypt"; }
   Item *get_copy(THD *thd)
@@ -766,7 +775,7 @@ public:
     constructor_helper();
   }
   String *val_str(String *);
-  void fix_length_and_dec() { maybe_null=1; max_length = 13; }
+  bool fix_length_and_dec() { maybe_null=1; max_length = 13; return FALSE; }
   const char *func_name() const { return "encrypt"; }
   bool check_vcol_func_processor(void *arg)
   {
@@ -790,7 +799,7 @@ public:
   Item_func_encode(THD *thd, Item *a, Item *seed_arg):
     Item_str_binary_checksum_func(thd, a, seed_arg) {}
   String *val_str(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "encode"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_encode>(thd, this); }
@@ -840,10 +849,11 @@ class Item_func_database :public Item_func_sysconst
 public:
   Item_func_database(THD *thd): Item_func_sysconst(thd) {}
   String *val_str(String *);
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
     max_length= MAX_FIELD_NAME * system_charset_info->mbmaxlen;
     maybe_null=1;
+    return FALSE;
   }
   const char *func_name() const { return "database"; }
   const char *fully_qualified_func_name() const { return "database()"; }
@@ -863,10 +873,11 @@ public:
   {
     str->append(func_name());
   }
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
     max_length= 512 * system_charset_info->mbmaxlen;
     null_value= maybe_null= false;
+    return FALSE;
   }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_sqlerrm>(thd, this); }
@@ -889,10 +900,11 @@ public:
     return (null_value ? 0 : &str_value);
   }
   bool fix_fields(THD *thd, Item **ref);
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
     max_length= (uint32) (username_char_length +
                  HOSTNAME_LENGTH + 1) * SYSTEM_CHARSET_MBMAXLEN;
+    return FALSE;
   }
   const char *func_name() const { return "user"; }
   const char *fully_qualified_func_name() const { return "user()"; }
@@ -932,8 +944,11 @@ public:
   Item_func_current_role(THD *thd, Name_resolution_context *context_arg):
     Item_func_sysconst(thd), context(context_arg) {}
   bool fix_fields(THD *thd, Item **ref);
-  void fix_length_and_dec()
-  { max_length= (uint32) username_char_length * SYSTEM_CHARSET_MBMAXLEN; }
+  bool fix_length_and_dec()
+  {
+    max_length= (uint32) username_char_length * SYSTEM_CHARSET_MBMAXLEN;
+    return FALSE;
+  }
   int save_in_field(Field *field, bool no_conversions)
   { return save_str_value_in_field(field, &str_value); }
   const char *func_name() const { return "current_role"; }
@@ -961,7 +976,7 @@ class Item_func_soundex :public Item_str_func
 public:
   Item_func_soundex(THD *thd, Item *a): Item_str_func(thd, a) {}
   String *val_str(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "soundex"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_soundex>(thd, this); }
@@ -975,7 +990,7 @@ public:
   double val_real();
   longlong val_int();
   String *val_str(String *str);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "elt"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_elt>(thd, this); }
@@ -989,7 +1004,7 @@ class Item_func_make_set :public Item_str_func
 public:
   Item_func_make_set(THD *thd, List<Item> &list): Item_str_func(thd, list) {}
   String *val_str(String *str);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "make_set"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_make_set>(thd, this); }
@@ -1006,7 +1021,7 @@ public:
     Item_str_ascii_func(thd, org, dec, lang) {}
 
   String *val_str_ascii(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "format"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_format>(thd, this); }
@@ -1026,9 +1041,10 @@ public:
   { collation.set(cs); }
   String *val_str(String *);
   void append_char(String * str, int32 num);
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
     max_length= arg_count * 4;
+    return FALSE;
   }
   const char *func_name() const { return "char"; }
   void print(String *str, enum_query_type query_type);
@@ -1042,9 +1058,10 @@ public:
   Item_func_chr(THD *thd, Item *arg1, CHARSET_INFO *cs):
     Item_func_char(thd, arg1, cs) {}
   String *val_str(String *);
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
     max_length= 4;
+    return FALSE;
   }
   const char *func_name() const { return "chr"; }
   Item *get_copy(THD *thd)
@@ -1058,7 +1075,7 @@ public:
   Item_func_repeat(THD *thd, Item *arg1, Item *arg2):
     Item_str_func(thd, arg1, arg2) {}
   String *val_str(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "repeat"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_repeat>(thd, this); }
@@ -1070,7 +1087,7 @@ class Item_func_space :public Item_str_func
 public:
   Item_func_space(THD *thd, Item *arg1): Item_str_func(thd, arg1) {}
   String *val_str(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "space"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_space>(thd, this); }
@@ -1083,7 +1100,7 @@ public:
   Item_func_binlog_gtid_pos(THD *thd, Item *arg1, Item *arg2):
     Item_str_func(thd, arg1, arg2) {}
   String *val_str(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "binlog_gtid_pos"; }
   bool check_vcol_func_processor(void *arg)
   {
@@ -1103,7 +1120,7 @@ public:
     Item_str_func(thd, arg1, arg2, arg3) {}
   Item_func_pad(THD *thd, Item *arg1, Item *arg2):
     Item_str_func(thd, arg1, arg2) {}
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
 };
 
 
@@ -1130,10 +1147,11 @@ public:
     Item_func_rpad(thd, arg1, arg2, arg3) {}
   Item_func_rpad_oracle(THD *thd, Item *arg1, Item *arg2):
     Item_func_rpad(thd, arg1, arg2) {}
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
-    Item_func_rpad::fix_length_and_dec();
+    bool res= Item_func_rpad::fix_length_and_dec();
     maybe_null= true;
+    return res;
   }
   const char *func_name() const { return "rpad_oracle"; }
   Item *get_copy(THD *thd)
@@ -1164,10 +1182,11 @@ public:
     Item_func_lpad(thd, arg1, arg2, arg3) {}
   Item_func_lpad_oracle(THD *thd, Item *arg1, Item *arg2):
     Item_func_lpad(thd, arg1, arg2) {}
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
-    Item_func_lpad::fix_length_and_dec();
+    bool res= Item_func_lpad::fix_length_and_dec();
     maybe_null= true;
+    return res;
   }
   const char *func_name() const { return "lpad_oracle"; }
   Item *get_copy(THD *thd)
@@ -1182,11 +1201,12 @@ public:
     Item_str_func(thd, a, b, c) {}
   const char *func_name() const { return "conv"; }
   String *val_str(String *);
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
     collation.set(default_charset());
     max_length=64;
     maybe_null= 1;
+    return FALSE;
   }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_conv>(thd, this); }
@@ -1216,12 +1236,13 @@ public:
     DBUG_ASSERT(fixed);
     return m_arg0_type_handler->Item_func_hex_val_str_ascii(this, str);
   }
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
     collation.set(default_charset(), DERIVATION_COERCIBLE, MY_REPERTOIRE_ASCII);
     decimals=0;
     fix_char_length(args[0]->max_length * 2);
     m_arg0_type_handler= args[0]->type_handler();
+    return FALSE;
   }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_hex>(thd, this); }
@@ -1238,11 +1259,12 @@ public:
   }
   const char *func_name() const { return "unhex"; }
   String *val_str(String *);
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
     collation.set(&my_charset_bin);
     decimals=0;
     max_length=(1+args[0]->max_length)/2;
+    return FALSE;
   }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_unhex>(thd, this); }
@@ -1261,11 +1283,12 @@ public:
     Item_str_func(thd, a, b), is_min(is_min_arg)
   { maybe_null= 1; }
   String *val_str(String *);
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
     collation.set(args[0]->collation);
     decimals=0;
     max_length= MAX_BLOB_WIDTH;
+    return FALSE;
   }
 };
 
@@ -1306,10 +1329,11 @@ public:
       tmp->set_charset(&my_charset_bin);
     return tmp;
   }
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
     collation.set(&my_charset_bin);
     max_length=args[0]->max_length;
+    return FALSE;
   }
   void print(String *str, enum_query_type query_type);
   const char *func_name() const { return "cast_as_binary"; }
@@ -1326,11 +1350,12 @@ public:
   Item_load_file(THD *thd, Item *a): Item_str_func(thd, a) {}
   String *val_str(String *);
   const char *func_name() const { return "load_file"; }
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
     collation.set(&my_charset_bin, DERIVATION_COERCIBLE);
     maybe_null=1;
     max_length=MAX_BLOB_WIDTH;
+    return FALSE;
   }
   bool check_vcol_func_processor(void *arg)
   {
@@ -1351,7 +1376,7 @@ class Item_func_export_set: public Item_str_func
   Item_func_export_set(THD *thd, Item *a, Item *b, Item* c, Item* d, Item* e):
     Item_str_func(thd, a, b, c, d, e) {}
   String  *val_str(String *str);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "export_set"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_export_set>(thd, this); }
@@ -1365,12 +1390,13 @@ public:
   Item_func_quote(THD *thd, Item *a): Item_str_func(thd, a) {}
   const char *func_name() const { return "quote"; }
   String *val_str(String *);
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
     collation.set(args[0]->collation);
     ulonglong max_result_length= (ulonglong) args[0]->max_length * 2 +
                                   2 * collation.collation->mbmaxlen;
     max_length= (uint32) MY_MIN(max_result_length, MAX_BLOB_WIDTH);
+    return FALSE;
   }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_quote>(thd, this); }
@@ -1453,7 +1479,7 @@ public:
       return 1;
     return res;
   }
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "convert"; }
   void print(String *str, enum_query_type query_type);
   Item *get_copy(THD *thd)
@@ -1467,7 +1493,7 @@ public:
   Item_func_set_collation(THD *thd, Item *a, CHARSET_INFO *set_collation):
     Item_str_func(thd, a), m_set_collation(set_collation) {}
   String *val_str(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   bool eq(const Item *item, bool binary_cmp) const;
   const char *func_name() const { return "collate"; }
   enum precedence precedence() const { return COLLATE_PRECEDENCE; }
@@ -1488,11 +1514,12 @@ class Item_func_expr_str_metadata :public Item_str_func
 {
 public:
   Item_func_expr_str_metadata(THD *thd, Item *a): Item_str_func(thd, a) { }
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
      collation.set(system_charset_info);
      max_length= 64 * collation.collation->mbmaxlen; // should be enough
      maybe_null= 0;
+     return FALSE;
   };
   table_map not_null_tables() const { return 0; }
   Item* propagate_equal_fields(THD *thd, const Context &ctx, COND_EQUAL *cond)
@@ -1542,7 +1569,7 @@ public:
   }
   const char *func_name() const { return "weight_string"; }
   String *val_str(String *);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   bool eq(const Item *item, bool binary_cmp) const
   {
     if (!Item_str_func::eq(item, binary_cmp))
@@ -1568,7 +1595,7 @@ public:
   Item_func_crc32(THD *thd, Item *a): Item_long_func(thd, a)
   { unsigned_flag= 1; }
   const char *func_name() const { return "crc32"; }
-  void fix_length_and_dec() { max_length=10; }
+  bool fix_length_and_dec() { max_length=10; return FALSE; }
   longlong val_int();
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_crc32>(thd, this); }
@@ -1581,7 +1608,7 @@ public:
   Item_func_uncompressed_length(THD *thd, Item *a)
    :Item_long_func_length(thd, a) {}
   const char *func_name() const{return "uncompressed_length";}
-  void fix_length_and_dec() { max_length=10; maybe_null= true; }
+  bool fix_length_and_dec() { max_length=10; maybe_null= true; return FALSE; }
   longlong val_int();
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_uncompressed_length>(thd, this); }
@@ -1599,7 +1626,11 @@ class Item_func_compress: public Item_str_binary_checksum_func
 public:
   Item_func_compress(THD *thd, Item *a)
    :Item_str_binary_checksum_func(thd, a) {}
-  void fix_length_and_dec(){max_length= (args[0]->max_length*120)/100+12;}
+  bool fix_length_and_dec()
+  {
+    max_length= (args[0]->max_length * 120) / 100 + 12;
+    return FALSE;
+  }
   const char *func_name() const{return "compress";}
   String *val_str(String *) ZLIB_DEPENDED_FUNCTION
   Item *get_copy(THD *thd)
@@ -1612,7 +1643,11 @@ class Item_func_uncompress: public Item_str_binary_checksum_func
 public:
   Item_func_uncompress(THD *thd, Item *a)
    :Item_str_binary_checksum_func(thd, a) {}
-  void fix_length_and_dec(){ maybe_null= 1; max_length= MAX_BLOB_WIDTH; }
+  bool fix_length_and_dec()
+  {
+    maybe_null= 1; max_length= MAX_BLOB_WIDTH;
+    return FALSE;
+  }
   const char *func_name() const{return "uncompress";}
   String *val_str(String *) ZLIB_DEPENDED_FUNCTION
   Item *get_copy(THD *thd)
@@ -1624,11 +1659,12 @@ class Item_func_uuid: public Item_str_func
 {
 public:
   Item_func_uuid(THD *thd): Item_str_func(thd) {}
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
     collation.set(system_charset_info,
                   DERIVATION_COERCIBLE, MY_REPERTOIRE_ASCII);
     fix_char_length(MY_UUID_STRING_LENGTH);
+    return FALSE;
   }
   bool const_item() const { return false; }
   table_map used_tables() const { return RAND_TABLE_BIT; }
@@ -1656,7 +1692,7 @@ protected:
 public:
   Item_func_dyncol_create(THD *thd, List<Item> &args, DYNCALL_CREATE_DEF *dfs);
   bool fix_fields(THD *thd, Item **ref);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const{ return "column_create"; }
   String *val_str(String *);
   void print(String *str, enum_query_type query_type);
@@ -1686,11 +1722,12 @@ public:
     {collation.set(DYNCOL_UTF);}
   const char *func_name() const{ return "column_json"; }
   String *val_str(String *);
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
     max_length= MAX_BLOB_WIDTH;
     maybe_null= 1;
     decimals= 0;
+    return FALSE;
   }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_dyncol_json>(thd, this); }
@@ -1705,8 +1742,8 @@ class Item_dyncol_get: public Item_str_func
 public:
   Item_dyncol_get(THD *thd, Item *str, Item *num): Item_str_func(thd, str, num)
   {}
-  void fix_length_and_dec()
-  { maybe_null= 1;; max_length= MAX_BLOB_WIDTH; }
+  bool fix_length_and_dec()
+  { maybe_null= 1;; max_length= MAX_BLOB_WIDTH; return FALSE; }
   /* Mark that collation can change between calls */
   bool dynamic_result() { return 1; }
 
@@ -1744,7 +1781,8 @@ class Item_func_dyncol_list: public Item_str_func
 public:
   Item_func_dyncol_list(THD *thd, Item *str): Item_str_func(thd, str)
     {collation.set(DYNCOL_UTF);}
-  void fix_length_and_dec() { maybe_null= 1; max_length= MAX_BLOB_WIDTH; };
+  bool fix_length_and_dec()
+  { maybe_null= 1; max_length= MAX_BLOB_WIDTH; return FALSE; };
   const char *func_name() const{ return "column_list"; }
   String *val_str(String *);
   Item *get_copy(THD *thd)
@@ -1767,7 +1805,7 @@ public:
   String *val_str(String *str);
   enum Functype functype() const { return  TEMPTABLE_ROWID; }
   const char *func_name() const { return "<rowid>"; }
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_temptable_rowid>(thd, this); }
 };