Skip to content

Commit f609dbd

Browse files
committed
MDEV-30692: conf_to_src incompatible with CHARSET_INFO changes (postfix)
Caused by MDEV-30577 when the CHARSET_INFO structure changed. As hinted by clang: error: no member named 'csname' in 'struct charset_info_st'; did you mean 'cs_name'? Because the target conf_to_src has the properties EXCLUDE_FROM_DEFAULT_BUILD it hasn't been noticed. Also correct: warning: field precision should have type 'int', but argument has type 'size_t'
1 parent 77a3d7a commit f609dbd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

strings/conf_to_src.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ main(int argc, char **argv __attribute__((unused)))
482482
if ( (!simple_cs_is_full(cs)) && (cs->cs_name.str))
483483
{
484484
snprintf(filename, sizeof filename, "%s/%.*s.xml",
485-
argv[1], cs->csname.length, cs->csname.str);
485+
argv[1], (int) cs->cs_name.length, cs->cs_name.str);
486486
my_read_charset_file(filename);
487487
}
488488
cs->state|= MY_CS_LOADED;

0 commit comments

Comments
 (0)