diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-19 19:58:27 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-19 20:22:33 +0200 |
| commit | dde2ca4aa108b611b5fdfc970146b28461ef08bf (patch) | |
| tree | 08f90bb9d54413af23230ccf99f18391596afa34 /strings | |
| parent | b5ac863f1494920b5e7035c9dfa0ebfdaa50a15d (diff) | |
| parent | fd58bb71e22196c3c5e8d20b92bce6f343f1dea1 (diff) | |
| download | mariadb-git-dde2ca4aa108b611b5fdfc970146b28461ef08bf.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/json_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/json_lib.c b/strings/json_lib.c index 2b764e8827e..7a6e0c5cbff 100644 --- a/strings/json_lib.c +++ b/strings/json_lib.c @@ -772,7 +772,7 @@ static json_state_handler json_actions[NR_JSON_STATES][NR_C_CLASSES]= syntax_error, syntax_error, syntax_error, syntax_error, syntax_error, syntax_error, syntax_error, syntax_error, not_json_chr, bad_chr}, {/*OBJ_CONT*/ - unexpected_eos, syntax_error, end_object, syntax_error, end_array, + unexpected_eos, syntax_error, end_object, syntax_error, syntax_error, syntax_error, next_key, syntax_error, syntax_error, syntax_error, syntax_error, syntax_error, syntax_error, not_json_chr, bad_chr}, {/*ARRAY_CONT*/ |