bk commit into 4.1 tree (jani:1.2385)

[jani]

Below is the list of changes that have just been committed into a local
4.1 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.2385 05/08/18 21:41:19 jani@stripped +2 -0
  Applied some local Netware related changes to 4.1.14.
  These are already in the main source tree.

  sql/mysqld.cc
    1.586 05/08/18 21:41:00 jani@stripped +1 -0
    Applied some local Netware related changes to 4.1.14.
    These are already in the main source tree.

  include/config-netware.h
    1.7 05/08/18 21:41:00 jani@stripped +12 -0
    Applied some local Netware related changes to 4.1.14.
    These are already in the main source tree.

# 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:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/jani/mydev/mysql-4.1.14-build-dev

--- 1.585/sql/mysqld.cc	2005-08-15 19:59:07 +03:00
+++ 1.586/sql/mysqld.cc	2005-08-18 21:41:00 +03:00
@@ -152,6 +152,7 @@
 #define zVOLSTATE_MAINTENANCE 3
 
 #ifdef __NETWARE__
+#include <nks/netware.h>
 #include <nks/vm.h>
 #include <library.h>
 #include <monitor.h>

--- 1.6/include/config-netware.h	2005-07-23 01:11:17 +03:00
+++ 1.7/include/config-netware.h	2005-08-18 21:41:00 +03:00
@@ -51,6 +51,18 @@
 #define HAVE_PTHREAD_YIELD_ZERO_ARG 1
 #define HAVE_BROKEN_REALPATH 1
 
+/* changes made to make use of LibC-June-2004 for building purpose */
+#undef HAVE_POSIX_SIGNALS
+#undef HAVE_PTHREAD_ATTR_SETSCOPE
+#undef HAVE_ALLOC_A
+#undef HAVE_FINITE
+#undef HAVE_GETPWNAM
+#undef HAVE_GETPWUID
+#undef HAVE_PTHREAD_SETSCHEDPARAM
+#undef HAVE_READLINK
+#undef HAVE_STPCPY
+/* changes  end  */
+
 /* no libc crypt() function */
 #ifdef HAVE_OPENSSL
   #define HAVE_CRYPT 1