Commit 0e3921a8 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Remove --loose-skip-pbxt kludge from mysql_install_db

and mysql_upgrade_service, after LPBUG#688404 was 
fixed.
parent 30acab27
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
#include <aclapi.h> #include <aclapi.h>
#define USAGETEXT \ #define USAGETEXT \
"mysql_install_db.exe Ver 1.42 for Windows\n" \ "mysql_install_db.exe Ver 1.42 for Windows\n" \
"This software comes with ABSOLUTELY NO WARRANTY. This is free software,\n" \ "This software comes with ABSOLUTELY NO WARRANTY. This is free software,\n" \
"and you are welcome to modify and redistribute it under the GPL v2 license\n" \ "and you are welcome to modify and redistribute it under the GPL v2 license\n" \
"Usage: mysql_install_db.exe [OPTIONS]\n" \ "Usage: mysql_install_db.exe [OPTIONS]\n" \
"OPTIONS:" "OPTIONS:"
...@@ -272,11 +272,6 @@ static int create_myini() ...@@ -272,11 +272,6 @@ static int create_myini()
fprintf(myini,"port=%d\n", opt_port); fprintf(myini,"port=%d\n", opt_port);
} }
#ifdef _WIN64
/* PBXT does not work in 64 bit windows, sorry. */
fprintf(myini, "loose-skip-pbxt\n");
#endif
/* Write out client settings. */ /* Write out client settings. */
fprintf(myini, "[client]\n"); fprintf(myini, "[client]\n");
if(opt_socket && opt_socket[0]) if(opt_socket && opt_socket[0])
......
...@@ -394,17 +394,12 @@ static void change_service_config() ...@@ -394,17 +394,12 @@ static void change_service_config()
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.
*/ */
WritePrivateProfileString("mysqld", "basedir",NULL, props.inifile); 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 Replace default-character-set with character-set-server, to avoid
"default-character-set is deprecated and will be replaced ..." "default-character-set is deprecated and will be replaced ..."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment