From eca15790514f5907add11fff6c91e68d92fbde64 Mon Sep 17 00:00:00 2001 From: Alexey Botchkov Date: Sat, 3 Dec 2016 11:32:47 +0400 Subject: MDEV-11444 Server crashes in String::ptr / Item_func_json_depth::val_int. CAST AS JSON didn't set the null_value mark properly. --- sql/item_jsonfunc.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'sql/item_jsonfunc.h') diff --git a/sql/item_jsonfunc.h b/sql/item_jsonfunc.h index d2d68b4c391..e8d677158ed 100644 --- a/sql/item_jsonfunc.h +++ b/sql/item_jsonfunc.h @@ -420,11 +420,7 @@ public: const char *func_name() const { return "cast_as_json"; } bool is_json_type() { return true; } void fix_length_and_dec(); - String *val_str(String *str) - { - return args[0]->val_str(str); - } - + String *val_str(String *str); Item *get_copy(THD *thd, MEM_ROOT *mem_root) { return get_item_copy(thd, mem_root, this); } }; -- cgit v1.2.1