summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2021-11-18 00:51:17 +0100
committerVladislav Vaintroub <wlad@mariadb.com>2021-11-18 00:55:09 +0100
commit81d7adb1e2cdfb1064279b8643a8c3d22b3dd423 (patch)
tree2edaccae10d2d5e2e18dff579fafdf4a918d1aeb
parented0a224b3d42423699d977c338e3da05fccafaf2 (diff)
downloadmariadb-git-81d7adb1e2cdfb1064279b8643a8c3d22b3dd423.tar.gz
MDEV-27075 mysql_upgrade_service.exe - using uninitialized memory 'defaults_file'
Remove section that was trying to rename default-character-set to character-set-server This seems to be an old workaround for some upgrade warning, which did not work for some time already, because the ini filename was not initialized.
-rw-r--r--sql/mysql_upgrade_service.cc19
1 files changed, 0 insertions, 19 deletions
diff --git a/sql/mysql_upgrade_service.cc b/sql/mysql_upgrade_service.cc
index 37dae648563..5afe4ccbc52 100644
--- a/sql/mysql_upgrade_service.cc
+++ b/sql/mysql_upgrade_service.cc
@@ -317,9 +317,6 @@ void initiate_mysqld_shutdown()
*/
static void change_service_config()
{
-
- char defaults_file[MAX_PATH];
- char default_character_set[64];
char buf[MAX_PATH];
char commandline[3*MAX_PATH + 19];
int i;
@@ -382,22 +379,6 @@ static void change_service_config()
*/
WritePrivateProfileString("mysqld", "basedir",NULL, props.inifile);
- /*
- Replace default-character-set with character-set-server, to avoid
- "default-character-set is deprecated and will be replaced ..."
- message.
- */
- default_character_set[0]= 0;
- GetPrivateProfileString("mysqld", "default-character-set", NULL,
- default_character_set, sizeof(default_character_set), defaults_file);
- if (default_character_set[0])
- {
- WritePrivateProfileString("mysqld", "default-character-set", NULL,
- defaults_file);
- WritePrivateProfileString("mysqld", "character-set-server",
- default_character_set, defaults_file);
- }
-
sprintf(defaults_file_param,"--defaults-file=%s", props.inifile);
sprintf_s(commandline, "\"%s\" \"%s\" \"%s\"", mysqld_path,
defaults_file_param, opt_service);