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

Browse Source
This commit is contained in:
Marko Mäkelä
2023-04-14 12:24:14 +03:00
parent e68f0f0986 44281b88f3
commit a009280e60
383 changed files with 13231 additions and 7495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
strings/conf_to_src.c
View File

@@ -471,7 +471,7 @@ main(int argc, char **argv __attribute__((unused)))
bzero((void*)&all_charsets,sizeof(all_charsets));
bzero((void*) refids, sizeof(refids));
sprintf(filename,"%s/%s",argv[1],"Index.xml");
snprintf(filename,sizeof(filename),"%s/%s",argv[1],"Index.xml");
my_read_charset_file(filename);
for (cs= all_charsets;
@@ -482,7 +482,8 @@ main(int argc, char **argv __attribute__((unused)))
{
if ( (!simple_cs_is_full(cs)) && (cs->cs_name.str))
{
sprintf(filename,"%s/%s.xml",argv[1], cs->cs_name.str);
snprintf(filename, sizeof filename, "%s/%.*s.xml",
argv[1], cs->csname.length, cs->csname.str);
my_read_charset_file(filename);
}
cs->state|= MY_CS_LOADED;