database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2020-10-29 13:38:38 +02:00
parent 27b762e23d 1e778a3b56
commit 7b2bb67113
177 changed files with 20549 additions and 2952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
strings/json_lib.c
View File

@ -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 == ':')
{