diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-29 13:38:38 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-29 13:38:38 +0200 |
commit | 7b2bb67113bdda470955e3d4d72be0f2c0b38902 (patch) | |
tree | 9f9f34da1a4e48c243c56ff161987074ef907cbb /strings | |
parent | 27b762e23d8305bbc65dc61d283fe192e2dbd00a (diff) | |
parent | 1e778a3b5624f97fdf44a15fd6cee3d615891cff (diff) | |
download | mariadb-git-7b2bb67113bdda470955e3d4d72be0f2c0b38902.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 632a0ba989d..83d5fdaa016 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 == ':') { |