diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 11:45:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 11:45:00 +0300 |
| commit | 4930f9c94bb610f4d76b73a8b6b351d9fa9c5d68 (patch) | |
| tree | ed6b2754116233ca8a39515c7ba06e09b2a8cdc8 /sql/item_jsonfunc.cc | |
| parent | 502b769561760f35d2b612ab984906c8a4bb9b51 (diff) | |
| parent | d104fe6f734df2aebe24b3e5e3dbc189a5302920 (diff) | |
| download | mariadb-git-4930f9c94bb610f4d76b73a8b6b351d9fa9c5d68.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/item_jsonfunc.cc')
| -rw-r--r-- | sql/item_jsonfunc.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc index af14734eae3..e7f2b3d8eee 100644 --- a/sql/item_jsonfunc.cc +++ b/sql/item_jsonfunc.cc @@ -624,8 +624,6 @@ String *Item_func_json_unquote::read_json(json_engine_t *je) json_scan_start(je, js->charset(),(const uchar *) js->ptr(), (const uchar *) js->ptr() + js->length()); - je->value_type= (enum json_value_types) -1; /* To report errors right. */ - if (json_read_value(je)) goto error; @@ -988,7 +986,8 @@ my_decimal *Item_func_json_extract::val_decimal(my_decimal *to) case JSON_VALUE_ARRAY: case JSON_VALUE_FALSE: case JSON_VALUE_NULL: - break; + case JSON_VALUE_UNINITALIZED: + break; }; } int2my_decimal(E_DEC_FATAL_ERROR, 0, false/*unsigned_flag*/, to); |