Merge commit '6b8802e8dd5467556a024d807a1df23940b00895' into bb-10.3-fix_len_decbb-10.3-fix_len_dec

1 files changed, 21 insertions, 19 deletions

diff --git a/sql/item_jsonfunc.h b/sql/item_jsonfunc.h
index 354de69eee4..af0995b9605 100644
--- a/sql/item_jsonfunc.h
+++ b/sql/item_jsonfunc.h
@@ -49,10 +49,12 @@ public:
   Item_func_json_valid(THD *thd, Item *json) : Item_bool_func(thd, json) {}
   longlong val_int();
   const char *func_name() const { return "json_valid"; }
-  void fix_length_and_dec()
+  bool fix_length_and_dec()
   {
-    Item_bool_func::fix_length_and_dec();
+    if (Item_bool_func::fix_length_and_dec())
+      return TRUE;
     maybe_null= 1;
+    return FALSE;
   }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_json_valid>(thd, this); }
@@ -69,7 +71,7 @@ public:
   Item_func_json_exists(THD *thd, Item *js, Item *i_path):
     Item_bool_func(thd, js, i_path) {}
   const char *func_name() const { return "json_exists"; }
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_json_exists>(thd, this); }
   longlong val_int();
@@ -86,7 +88,7 @@ public:
   Item_func_json_value(THD *thd, Item *js, Item *i_path):
     Item_str_func(thd, js, i_path) {}
   const char *func_name() const { return "json_value"; }
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   String *val_str(String *);
   virtual bool check_and_get_value(json_engine_t *je, String *res, int *error);
   Item *get_copy(THD *thd)
@@ -115,7 +117,7 @@ protected:
 public:
   Item_func_json_quote(THD *thd, Item *s): Item_str_func(thd, s) {}
   const char *func_name() const { return "json_quote"; }
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   String *val_str(String *);
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_json_quote>(thd, this); }
@@ -130,7 +132,7 @@ protected:
 public:
   Item_func_json_unquote(THD *thd, Item *s): Item_str_func(thd, s) {}
   const char *func_name() const { return "json_unquote"; }
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   String *val_str(String *);
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_json_unquote>(thd, this); }
@@ -163,7 +165,7 @@ public:
     Item_json_str_multipath(thd, list) {}
   const char *func_name() const { return "json_extract"; }
   enum Functype functype() const   { return JSON_EXTRACT_FUNC; }
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   String *val_str(String *);
   longlong val_int();
   double val_real();
@@ -185,7 +187,7 @@ public:
   Item_func_json_contains(THD *thd, List<Item> &list):
     Item_bool_func(thd, list) {}
   const char *func_name() const { return "json_contains"; }
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   longlong val_int();
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_json_contains>(thd, this); }
@@ -207,7 +209,7 @@ public:
     Item_bool_func(thd, list), tmp_paths(0) {}
   const char *func_name() const { return "json_contains_path"; }
   bool fix_fields(THD *thd, Item **ref);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   void cleanup();
   longlong val_int();
   Item *get_copy(THD *thd)
@@ -227,7 +229,7 @@ public:
     Item_str_func(thd, list) {}
   String *val_str(String *);
   bool is_json_type() { return true; }
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   const char *func_name() const { return "json_array"; }
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_json_array>(thd, this); }
@@ -242,7 +244,7 @@ protected:
 public:
   Item_func_json_array_append(THD *thd, List<Item> &list):
     Item_json_str_multipath(thd, list) {}
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   String *val_str(String *);
   uint get_n_paths() const { return arg_count/2; }
   const char *func_name() const { return "json_array_append"; }
@@ -309,7 +311,7 @@ public:
   Item_func_json_length(THD *thd, List<Item> &list):
     Item_long_func(thd, list) {}
   const char *func_name() const { return "json_length"; }
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   longlong val_int();
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_json_length>(thd, this); }
@@ -325,7 +327,7 @@ protected:
 public:
   Item_func_json_depth(THD *thd, Item *js): Item_long_func(thd, js) {}
   const char *func_name() const { return "json_depth"; }
-  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_json_depth>(thd, this); }
@@ -339,7 +341,7 @@ protected:
 public:
   Item_func_json_type(THD *thd, Item *js): Item_str_func(thd, js) {}
   const char *func_name() const { return "json_type"; }
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   String *val_str(String *);
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_json_type>(thd, this); }
@@ -356,7 +358,7 @@ public:
   Item_func_json_insert(bool i_mode, bool r_mode, THD *thd, List<Item> &list):
     Item_json_str_multipath(thd, list),
       mode_insert(i_mode), mode_replace(r_mode) {}
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   String *val_str(String *);
   uint get_n_paths() const { return arg_count/2; }
   const char *func_name() const
@@ -376,7 +378,7 @@ protected:
 public:
   Item_func_json_remove(THD *thd, List<Item> &list):
     Item_json_str_multipath(thd, list) {}
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   String *val_str(String *);
   uint get_n_paths() const { return arg_count - 1; }
   const char *func_name() const { return "json_remove"; }
@@ -395,7 +397,7 @@ public:
   Item_func_json_keys(THD *thd, List<Item> &list):
     Item_str_func(thd, list) {}
   const char *func_name() const { return "json_keys"; }
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   String *val_str(String *);
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_func_json_keys>(thd, this); }
@@ -419,7 +421,7 @@ public:
     Item_json_str_multipath(thd, list) {}
   const char *func_name() const { return "json_search"; }
   bool fix_fields(THD *thd, Item **ref);
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   String *val_str(String *);
   uint get_n_paths() const { return arg_count > 4 ? arg_count - 4 : 0; }
   Item *get_copy(THD *thd)
@@ -447,7 +449,7 @@ public:
     Item_str_func(thd, list), fmt(DETAILED) {}
 
   const char *func_name() const;
-  void fix_length_and_dec();
+  bool fix_length_and_dec();
   String *val_str(String *str);
   String *val_json(String *str);
   bool is_json_type() { return true; }