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 remote-tracking branch 'origin/10.3' into 10.4

Browse Source
This commit is contained in:
Alexander Barkov
2019-10-01 10:45:52 +04:00
parent f1dcbc2d9a 7e44c455f4
commit dc588e3d3f
26 changed files with 433 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
strings/json_lib.c
View File

@ -825,6 +825,11 @@ static int skip_colon(json_engine_t *j)
static int skip_key(json_engine_t *j)
{
int t_next, c_len;
if (json_instr_chr_map[j->s.c_next] == S_BKSL &&
json_handle_esc(&j->s))
return 1;
while (json_read_keyname_chr(j) == 0) {}
if (j->s.error)