diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 12:21:08 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 12:21:08 +0200 |
| commit | 65e8506ca9d03967191b6ed207cf107d311f7f99 (patch) | |
| tree | 3076ff798884b52655a5961be21e799708a4b628 /sql/item_jsonfunc.cc | |
| parent | 6adfce9c8d2a63a259dd0504600271498dcda228 (diff) | |
| parent | faddcf3c395da640b760c3f701f5bc1f3baae6c4 (diff) | |
| download | mariadb-git-65e8506ca9d03967191b6ed207cf107d311f7f99.tar.gz | |
Merge branch '10.3' into bb-10.4-releasemariadb-10.4.26
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 828ab690225..299a1626d64 100644 --- a/sql/item_jsonfunc.cc +++ b/sql/item_jsonfunc.cc @@ -2598,10 +2598,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; |