Imported fixes from 4.1 and 5.0 to 4.0.

include/config-netware.h

@@ -45,6 +45,7 @@ extern "C" {
 #undef HAVE_SCHED_H
 #undef HAVE_SYS_MMAN_H
 #undef HAVE_SYNCH_H
+#undef HAVE_RINT
 #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
 #define HAVE_PTHREAD_SIGMASK 1
 #define HAVE_PTHREAD_YIELD_ZERO_ARG 1
@@ -91,6 +92,9 @@ extern "C" {
 /* On NetWare, stack grows towards lower address*/
 #define STACK_DIRECTION -1
 
+/* On NetWare, to fix the problem with the deletion of open files */
+#define CANT_DELETE_OPEN_FILES 1
+
 /* default directory information */
 #define	DEFAULT_MYSQL_HOME    "sys:/mysql"
 #define PACKAGE               "mysql"

netware/mysql_test_run.c

@@ -173,7 +173,7 @@ void report_stats()
     mtr_log("\nFailed %u/%u test(s), %.02f%% successful.\n",
       total_fail, total_test, percent);
 		mtr_log("\nThe .out and .err files in %s may give you some\n", result_dir);
-		mtr_log("hint of what when wrong.\n");
+		mtr_log("hint of what went wrong.\n");
 		mtr_log("\nIf you want to report this error, please first read the documentation\n");
 		mtr_log("at: http://www.mysql.com/doc/M/y/MySQL_test_suite.html\n");
   }