Skip to content

Commit b2d8c63

Browse files
ParadoxV5grooverdan
authored andcommitted
Add missing LEX_STRING::strs for my_snprintf
When these members switched from plain `char*` to `LEX_CSTRING`, not all usages were converted. Specifically, in this commit are args of `my_snprintf` derivatives. Because until MDEV-21978, automated type checks were unavailable for those functions due to their incompatibility, so these tools didn’t catch them.
1 parent 74743b0 commit b2d8c63

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

sql/mysqld.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5732,7 +5732,7 @@ static void test_lc_time_sz()
57325732
(*loc)->max_day_name_length != max_day_len)
57335733
{
57345734
DBUG_PRINT("Wrong max day name(or month name) length for locale:",
5735-
("%s", (*loc)->name));
5735+
("%s", (*loc)->name.str));
57365736
DBUG_ASSERT(0);
57375737
}
57385738
}

sql/sys_vars.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6063,7 +6063,7 @@ static bool check_locale(sys_var *self, THD *thd, set_var *var)
60636063
{
60646064
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR,
60656065
"Can't process error message file for locale '%s'",
6066-
locale->name);
6066+
locale->name.str);
60676067
return true;
60686068
}
60696069
}

storage/maria/ha_maria.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2079,7 +2079,7 @@ int ha_maria::enable_indexes(key_map map, bool persist)
20792079
{
20802080
sql_print_warning("Warning: Enabling keys got errno %d on %s, "
20812081
"retrying",
2082-
my_errno, file->s->open_file_name);
2082+
my_errno, file->s->open_file_name.str);
20832083
/* Repairing by sort failed. Now try standard repair method. */
20842084
param->testflag &= ~T_REP_BY_SORT;
20852085
file->state->records= start_rows;

0 commit comments

Comments
 (0)