diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-28 10:01:50 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-28 10:01:50 +0200 |
commit | a8de8f261d1b7621b8e16396e87dfaac14891162 (patch) | |
tree | 9b8ec45858c2757305e0bdecf237fcb59251020c /strings | |
parent | e183aec1d75ea7b424ebe237e6b1643961903f2d (diff) | |
parent | 42e1815ad850384fad292534665ff61b78dd96f6 (diff) | |
download | mariadb-git-a8de8f261d1b7621b8e16396e87dfaac14891162.tar.gz |
Merge 10.2 into 10.3
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 d24fab4ddeb..8ae921b348a 100644 --- a/strings/json_lib.c +++ b/strings/json_lib.c @@ -895,7 +895,7 @@ int json_read_keyname_chr(json_engine_t *j) case S_QUOTE: for (;;) /* Skip spaces until ':'. */ { - if ((c_len= json_next_char(&j->s) > 0)) + if ((c_len= json_next_char(&j->s)) > 0) { if (j->s.c_next == ':') { |