diff options
| author | Monty <monty@mariadb.org> | 2018-01-01 19:39:59 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-01 19:39:59 +0200 |
| commit | fbab79c9b8a58b90292e900cf46ab6d6632ebb68 (patch) | |
| tree | 49738ad2561489954fa0973d82be10fafbf42e0b /sql/item_jsonfunc.cc | |
| parent | afbb72b3b6988f4c5242d46588754517724b2950 (diff) | |
| parent | aed2050e40cb332d54e8d40eb7242309b962c4e1 (diff) | |
| download | mariadb-git-fbab79c9b8a58b90292e900cf46ab6d6632ebb68.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
cmake/make_dist.cmake.in
mysql-test/r/func_json.result
mysql-test/r/ps.result
mysql-test/t/func_json.test
mysql-test/t/ps.test
sql/item_cmpfunc.h
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 38d6e4feba0..069bdf2e079 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); |