summaryrefslogtreecommitdiff
path: root/sql/item_jsonfunc.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/item_jsonfunc.cc')
-rw-r--r--sql/item_jsonfunc.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc
index 2fd2f459d0b..a3d1ff60e75 100644
--- a/sql/item_jsonfunc.cc
+++ b/sql/item_jsonfunc.cc
@@ -2663,10 +2663,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;