diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-02-04 19:51:23 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-02-04 19:51:23 +0100 |
| commit | 0e3921a8fef8dc58adfb93841e8eff144f89bdb9 (patch) | |
| tree | 5b0367759c918fbd1cfddda196f56860206df201 /sql/mysql_upgrade_service.cc | |
| parent | 30acab2746ebfb9cf495f678716e9b804cffef6b (diff) | |
| download | mariadb-git-0e3921a8fef8dc58adfb93841e8eff144f89bdb9.tar.gz | |
Remove --loose-skip-pbxt kludge from mysql_install_db
and mysql_upgrade_service, after LPBUG#688404 was
fixed.
Diffstat (limited to 'sql/mysql_upgrade_service.cc')
| -rw-r--r-- | sql/mysql_upgrade_service.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/mysql_upgrade_service.cc b/sql/mysql_upgrade_service.cc index fa5369346e2..fea10076a54 100644 --- a/sql/mysql_upgrade_service.cc +++ b/sql/mysql_upgrade_service.cc @@ -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 ..." |