database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2020-10-28 10:01:50 +02:00
parent e183aec1d7 42e1815ad8
commit a8de8f261d
122 changed files with 19106 additions and 2561 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 == ':')
{