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.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2018-08-03 15:57:23 +03:00
parent 8ae2a2dbe6 e6a808bec7
commit 05459706f2
191 changed files with 4363 additions and 1059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
strings/json_lib.c
View File

@@ -1643,6 +1643,8 @@ int json_escape(CHARSET_INFO *str_cs,
return -1;
}
}
else /* c_len == 0, an illegal symbol. */
return -1;
}
return (int)(json - json_start);