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

MWL#55: look for my.cnf in addition to my.ini trying to figure out defaults file for the service

Browse Source
This commit is contained in:
Vladislav Vaintroub 2011-02-08 13:07:31 +01:00
parent 47c776bc4c
commit 577d02b17d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/winservice.c
View File

@ -164,8 +164,12 @@ int get_mysql_service_properties(const wchar_t *bin_path,
*p= 0;
}
/* Look for my.ini in the install root */
/* Look for my.ini, my.cnf in the install root */
sprintf_s(props->inifile, MAX_PATH, "%s\\my.ini", install_root);
if (GetFileAttributes(props->inifile) == INVALID_FILE_ATTRIBUTES)
{
sprintf_s(props->inifile, MAX_PATH, "%s\\my.cnf", install_root);
}
if (GetFileAttributes(props->inifile) != INVALID_FILE_ATTRIBUTES)
{
/* Ini file found, get datadir from there */
@ -174,7 +178,7 @@ int get_mysql_service_properties(const wchar_t *bin_path,
}
else
{
/* Ini file was not found */
/* No ini file */
props->inifile[0]= 0;
}