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 10.8 into 10.9

Browse Source
This commit is contained in:
Marko Mäkelä
2023-01-10 14:50:58 +02:00
parent 0225159a8d 92c8d6f168
commit 820ebcec86
197 changed files with 3244 additions and 2320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/json_lib.h
View File

@@ -381,7 +381,7 @@ int json_find_paths_next(json_engine_t *je, json_find_paths_t *state);
#define JSON_ERROR_ILLEGAL_SYMBOL (-2)
/*
Converst JSON string constant into ordinary string constant
Convert JSON string constant into ordinary string constant
which can involve unpacking json escapes and changing character set.
Returns negative integer in the case of an error,
the length of the result otherwise.