Remove --loose-skip-pbxt kludge from mysql_install_db

and mysql_upgrade_service, after LPBUG#688404 was 
fixed.

2 files changed, 2 insertions, 12 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])
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 ..."