bk commit into 4.0 tree (jani:1.2167)

[jani]

Below is the list of changes that have just been committed into a local
4.0 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2167 05/10/25 16:56:25 jani@stripped +2 -0
  Imported fixes from 4.1 and 5.0 to 4.0.

  netware/mysql_test_run.c
    1.9 05/10/25 16:56:21 jani@stripped +1 -1
    Imported fixes from 4.1 and 5.0 to 4.0.

  include/config-netware.h
    1.6 05/10/25 16:56:21 jani@stripped +4 -0
    Imported fixes from 4.1 and 5.0 to 4.0.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	ua141d10.elisa.omakaista.fi
# Root:	/home/my/bk/mysql-4.0

--- 1.8/netware/mysql_test_run.c	2005-08-24 22:03:24 +03:00
+++ 1.9/netware/mysql_test_run.c	2005-10-25 16:56:21 +03:00
@@ -173,7 +173,7 @@
     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");
   }

--- 1.5/include/config-netware.h	2005-08-18 21:26:19 +03:00
+++ 1.6/include/config-netware.h	2005-10-25 16:56:21 +03:00
@@ -45,6 +45,7 @@
 #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
@@ -90,6 +91,9 @@
 
 /* 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"