1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sql/mysql_install_db.cc
View File

@ -14,8 +14,8 @@
#include <aclapi.h>
#define USAGETEXT \
"mysql_install_db.exe Ver 1.42 for Windows\n" \
"This software comes with ABSOLUTELY NO WARRANTY. This is free software,\n" \
"mysql_install_db.exe Ver 1.42 for Windows\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" \
"Usage: mysql_install_db.exe [OPTIONS]\n" \
"OPTIONS:"
@ -272,11 +272,6 @@ static int create_myini()
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. */
fprintf(myini, "[client]\n");
if(opt_socket && opt_socket[0])

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 ..."