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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2021-04-21 09:01:01 +03:00
parent 675c22c065 a0588d54a2
commit 80ed136e6d
163 changed files with 8191 additions and 3352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
strings/json_lib.c
View File

@@ -948,6 +948,7 @@ int json_read_value(json_engine_t *j)
{
int t_next, c_len, res;
j->value_type= JSON_VALUE_UNINITALIZED;
if (j->state == JST_KEY)
{
while (json_read_keyname_chr(j) == 0) {}