diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-29 13:38:38 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-29 13:38:38 +0200 |
| commit | 7b2bb67113bdda470955e3d4d72be0f2c0b38902 (patch) | |
| tree | 9f9f34da1a4e48c243c56ff161987074ef907cbb /sql/item_jsonfunc.cc | |
| parent | 27b762e23d8305bbc65dc61d283fe192e2dbd00a (diff) | |
| parent | 1e778a3b5624f97fdf44a15fd6cee3d615891cff (diff) | |
| download | mariadb-git-7b2bb67113bdda470955e3d4d72be0f2c0b38902.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/item_jsonfunc.cc')
| -rw-r--r-- | sql/item_jsonfunc.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc index e86ee5f68ad..0d15c5e9ad0 100644 --- a/sql/item_jsonfunc.cc +++ b/sql/item_jsonfunc.cc @@ -2425,6 +2425,8 @@ String *Item_func_json_merge_patch::val_str(String *str) uint n_arg; bool empty_result, merge_to_null; + /* To report errors properly if some JSON is invalid. */ + je1.s.error= je2.s.error= 0; merge_to_null= args[0]->null_value; for (n_arg=1; n_arg < arg_count; n_arg++) |