Checked and applied Novell-supplied patches inside the netware directory only.

netware/BUILD/compile-linux-tools:
  Need to run make on sql_yacc.cc.
netware/BUILD/compile-netware-END:
  Use .zip package.
netware/BUILD/compile-netware-all:
  Add compile-netware-src.
netware/BUILD/compile-netware-standard:
  Need backslash to avoid error.
netware/BUILD/mwenv:
  Add additional include, library paths, -dialect and -map flags for CW.
netware/BUILD/nwbootstrap:
  Additional status messages, update versions in .def files.
netware/Makefile.am:
  Cosmetic change, add @openssl_libs@ in case of OpenSSL feature usage.
netware/isamchk.def:
  Add SCREENNAME to allow interaction.
netware/my_manage.c:
  Take out unused args to mysqladmin.
netware/myisamchk.def:
  Add SCREENNAME to allow interaction.
netware/myisamlog.def:
  Add SCREENNAME to allow interaction.
netware/myisampack.def:
  Add SCREENNAME to allow interaction.
netware/mysql_test_run.c:
  Multiple changes to help test suite.
netware/mysqlbinlog.def:
  Add SCREENNAME to allow interaction.
netware/mysqlcheck.def:
  Add SCREENNAME to allow interaction.
netware/mysqld_safe.c:
  Make error message more accurate/descriptive.
netware/mysqldump.def:
  Add SCREENNAME to allow interaction.
netware/mysqlimport.def:
  Add SCREENNAME to allow interaction.

1 files changed, 6 insertions, 2 deletions

diff --git a/netware/my_manage.c b/netware/my_manage.c
index 490438b0485..1c1e75990b4 100644
--- a/netware/my_manage.c
+++ b/netware/my_manage.c
@@ -157,7 +157,7 @@ int sleep_until_file_deleted(char *pid_file)
 /******************************************************************************
 
 	sleep_until_file_exists()
-	
+
 	Sleep until the given file exists.
 
 ******************************************************************************/
@@ -199,9 +199,13 @@ int wait_for_server_start(char *bin_dir, char *user, char *password, int port)
   add_arg(&al, "--user=%s", user);
   add_arg(&al, "--password=%s", password);
   add_arg(&al, "--silent");
+
+  /** Not supported on NetWare
   add_arg(&al, "-O");
   add_arg(&al, "connect_timeout=10");
   add_arg(&al, "-w");
+  **/
+
   add_arg(&al, "--host=localhost");
   add_arg(&al, "ping");
 
@@ -210,7 +214,7 @@ int wait_for_server_start(char *bin_dir, char *user, char *password, int port)
 	for(i = 0; (i < TRY_MAX)
        && (err = spawn(mysqladmin_file, &al, TRUE, NULL,
                        trash, NULL)); i++) sleep(1);
-	
+
   // free args
   free_args(&al);