database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Remove --loose-skip-pbxt kludge from mysql_install_db

Browse Source 
and mysql_upgrade_service, after LPBUG#688404 was 
fixed.
This commit is contained in:
Vladislav Vaintroub
2011-02-04 19:51:23 +01:00
parent 30acab2746
commit 0e3921a8fe
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/mysql_upgrade_service.cc
View File

@ -394,17 +394,12 @@ static void change_service_config()
WritePrivateProfileString("mysqld", "datadir",buf, props.inifile);
}
/*
Remove basedir from defaults file, otherwise the service wont come up in
the new version, and will complain about mismatched message file.
*/
WritePrivateProfileString("mysqld", "basedir",NULL, props.inifile);
#ifdef _WIN64
/* Currently, pbxt is non-functional on x64 */
WritePrivateProfileString("mysqld", "loose-skip-pbxt","1", props.inifile);
#endif
/*
Replace default-character-set with character-set-server, to avoid
"default-character-set is deprecated and will be replaced ..."