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_install_db.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_install_db.cc')
| -rw-r--r-- | sql/mysql_install_db.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sql/mysql_install_db.cc b/sql/mysql_install_db.cc index 4541d48dcd1..abc8ccb0290 100644 --- a/sql/mysql_install_db.cc +++ b/sql/mysql_install_db.cc @@ -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]) |