diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-04 09:22:59 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-04 09:22:59 +0200 |
| commit | 145ae15a33210e13d33d6f41b145b3f04cab2263 (patch) | |
| tree | 02810e3c0d629f7d7def2dbc663154cbdb53242f /sql/item_jsonfunc.cc | |
| parent | acd2862e65a6555fba6065b7b4ded8513e2ce37c (diff) | |
| parent | 1a1bda2222e0c2ab41baed1510f6fbca80c20d31 (diff) | |
| download | mariadb-git-145ae15a33210e13d33d6f41b145b3f04cab2263.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/item_jsonfunc.cc')
| -rw-r--r-- | sql/item_jsonfunc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc index 7afb94ba332..4b2de7cf28b 100644 --- a/sql/item_jsonfunc.cc +++ b/sql/item_jsonfunc.cc @@ -781,10 +781,10 @@ String *Item_func_json_extract::read_json(String *str, { str->set_charset(js->charset()); str->length(0); - } - if (possible_multiple_values && str->append("[", 1)) - goto error; + if (possible_multiple_values && str->append("[", 1)) + goto error; + } json_get_path_start(&je, js->charset(),(const uchar *) js->ptr(), (const uchar *) js->ptr() + js->length(), &p); |