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 remote-tracking branch 'github/bb-11.4-release' into bb-11.8-serg

Browse Source
This commit is contained in:
Sergei Golubchik
2025-04-27 11:33:27 +02:00
committed by Oleksandr Byelkin
parent a0b77eb806 a8d4642375
commit 237e24497b
430 changed files with 14769 additions and 6751 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;