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 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

10
strings/json_lib.c
View File

@@ -1656,15 +1656,7 @@ int json_unescape(CHARSET_INFO *json_cs,
}
if (c_len == MY_CS_ILUNI)
{
/*
Result charset doesn't support the json's character.
Let's replace it with the '?' symbol.
*/
if ((c_len= my_ci_wc_mb(res_cs, '?', res, res_end)) > 0)
{
res+= c_len;
continue;
}
return -1;
}
/* Result buffer is too small. */
return -1;