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

Merge branch '10.11' into 11.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2025-04-26 10:53:02 +02:00
parent 1c09b5eadb 4d41ec081e
commit a8d4642375
335 changed files with 7809 additions and 3256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/json_lib.h
View File

@@ -387,7 +387,7 @@ int json_find_paths_next(json_engine_t *je, json_find_paths_t *state);
Returns negative integer in the case of an error,
the length of the result otherwise.
*/
int json_unescape(CHARSET_INFO *json_cs,
int __attribute__((warn_unused_result)) json_unescape(CHARSET_INFO *json_cs,
const uchar *json_str, const uchar *json_end,
CHARSET_INFO *res_cs,
uchar *res, uchar *res_end);
@@ -401,7 +401,8 @@ int json_unescape(CHARSET_INFO *json_cs,
JSON_ERROR_OUT_OF_SPACE Not enough space in the provided buffer
JSON_ERROR_ILLEGAL_SYMBOL Source symbol cannot be represented in JSON
*/
int json_escape(CHARSET_INFO *str_cs, const uchar *str, const uchar *str_end,
int __attribute__((warn_unused_result)) json_escape(CHARSET_INFO *str_cs,
const uchar *str, const uchar *str_end,
CHARSET_INFO *json_cs, uchar *json, uchar *json_end);