1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MWL#55: mysql_upgrade_service.exe will now ensure that datadir is always written to my.ini file

Browse Source
This commit is contained in:
Vladislav Vaintroub 2011-02-08 12:05:16 +01:00
parent e3b05c79c6
commit 47c776bc4c
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sql/mysql_upgrade_service.cc
View File

@ -339,6 +339,8 @@ static void change_service_config()
char defaults_file[MAX_PATH]; char defaults_file[MAX_PATH];
char default_character_set[64]; char default_character_set[64];
char buf[MAX_PATH];
int i;
scm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); scm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
if(!scm) if(!scm)
@ -376,10 +378,8 @@ static void change_service_config()
/* /*
Weird case, no --defaults-file in service definition, need to create one. Weird case, no --defaults-file in service definition, need to create one.
*/ */
char buf[MAX_PATH];
int i;
sprintf_s(props.inifile, MAX_PATH, "%s\\my.ini", props.datadir); sprintf_s(props.inifile, MAX_PATH, "%s\\my.ini", props.datadir);
}
/* /*
Write datadir to my.ini, after converting backslashes to Write datadir to my.ini, after converting backslashes to
@ -391,9 +391,8 @@ static void change_service_config()
if (buf[i] == '\\') if (buf[i] == '\\')
buf[i]= '/'; buf[i]= '/';
} }
WritePrivateProfileString("mysqld", "datadir",buf, props.inifile); WritePrivateProfileString("mysqld", "datadir",buf, props.inifile);
}
/* /*
Remove basedir from defaults file, otherwise the service wont come up in Remove basedir from defaults file, otherwise the service wont come up in
the new version, and will complain about mismatched message file. the new version, and will complain about mismatched message file.