diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 13:06:08 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 13:06:08 +0200 |
| commit | c442e1ae21edc1f63906ac6101f1e989b589846f (patch) | |
| tree | c98e223d5236f0e189104121fa96c591b05f1bd6 /sql/item_jsonfunc.cc | |
| parent | 4f54c219e7c73072d7eff1e81e0f51dc1ff47509 (diff) | |
| parent | 1ac0bce36e5bf2136cedb1ce1da949f53cce4404 (diff) | |
| download | mariadb-git-c442e1ae21edc1f63906ac6101f1e989b589846f.tar.gz | |
Merge branch '10.5' into 10.6
Diffstat (limited to 'sql/item_jsonfunc.cc')
| -rw-r--r-- | sql/item_jsonfunc.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc index 197a4b12907..3c2787cb799 100644 --- a/sql/item_jsonfunc.cc +++ b/sql/item_jsonfunc.cc @@ -2681,10 +2681,8 @@ String *Item_func_json_merge_patch::val_str(String *str) if (json_read_value(&je2)) goto error_return; if (je2.value_type == JSON_VALUE_OBJECT) - { - merge_to_null= true; goto cont_point; - } + merge_to_null= false; str->set(js2->ptr(), js2->length(), js2->charset()); goto cont_point; |