diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2016-12-03 11:32:47 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2016-12-03 11:32:47 +0400 |
| commit | eca15790514f5907add11fff6c91e68d92fbde64 (patch) | |
| tree | 13a41dea30d832d2b39432a8199c36b3e75b3b32 /sql/item_jsonfunc.h | |
| parent | 4ad0813a55657c3eec873b31c71d6b2afd043253 (diff) | |
| download | mariadb-git-eca15790514f5907add11fff6c91e68d92fbde64.tar.gz | |
MDEV-11444 Server crashes in String::ptr / Item_func_json_depth::val_int.
CAST AS JSON didn't set the null_value mark properly.
Diffstat (limited to 'sql/item_jsonfunc.h')
| -rw-r--r-- | sql/item_jsonfunc.h | 6 |
1 files changed, 1 insertions, 5 deletions
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<Item_json_typecast>(thd, mem_root, this); } }; |