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 'bb-10.4-release' into bb-10.5-release

Browse Source
This commit is contained in:
Sergei Golubchik
2021-02-15 16:43:15 +01:00
parent 5e3d3220bb 2696538723
commit 25d9d2e37f
316 changed files with 21851 additions and 3529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
strings/ctype-ucs2.c
View File

@@ -1161,9 +1161,12 @@ static size_t
my_snprintf_mb2(CHARSET_INFO *cs __attribute__((unused)),
char* to, size_t n, const char* fmt, ...)
{
size_t ret;
va_list args;
va_start(args,fmt);
return my_vsnprintf_mb2(to, n, fmt, args);
ret= my_vsnprintf_mb2(to, n, fmt, args);
va_end(args);
return ret;
}
@@ -2393,9 +2396,12 @@ static size_t
my_snprintf_utf32(CHARSET_INFO *cs __attribute__((unused)),
char* to, size_t n, const char* fmt, ...)
{
size_t ret;
va_list args;
va_start(args,fmt);
return my_vsnprintf_utf32(to, n, fmt, args);
ret= my_vsnprintf_utf32(to, n, fmt, args);
va_end(args);
return ret;
}