bk commit into 5.0 tree (jani:1.1990)

[jani]

Below is the list of changes that have just been committed into a local
5.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.1990 05/06/29 14:02:11 jani@stripped +3 -0
  Applied some Netware related patches.

  sql/mysqld.cc
    1.476 05/06/29 14:02:05 jani@stripped +1 -0
    Needed with latest libc.

  netware/my_print_defaults.def
    1.6 05/06/29 14:02:05 jani@stripped +2 -1
    Stack size increase.

  include/config-netware.h
    1.8 05/06/29 14:02:05 jani@stripped +10 -0
    Netware related fix. Some changes needed when building against latest libc (June 2005)

# 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/my/bk/mysql-5.0

--- 1.475/sql/mysqld.cc	2005-06-27 20:49:21 +03:00
+++ 1.476/sql/mysqld.cc	2005-06-29 14:02:05 +03:00
@@ -140,6 +140,7 @@
 #define zVOLSTATE_DEACTIVE 2
 #define zVOLSTATE_MAINTENANCE 3
 
+#include <nks/netware.h>
 #include <nks/vm.h>
 #include <library.h>
 #include <monitor.h>

--- 1.5/netware/my_print_defaults.def	2004-11-30 19:58:13 +02:00
+++ 1.6/netware/my_print_defaults.def	2005-06-29 14:02:05 +03:00
@@ -4,7 +4,8 @@
 MODULE	libc.nlm
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Print Defaults Tool"
-VERSION 4, 0
+VERSION 5, 0, 8
+STACKSIZE 32767
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 

--- 1.7/include/config-netware.h	2005-03-21 22:28:50 +02:00
+++ 1.8/include/config-netware.h	2005-06-29 14:02:05 +03:00
@@ -46,11 +46,21 @@
 #undef HAVE_SYS_MMAN_H
 #undef HAVE_SYNCH_H
 #undef HAVE_MMAP
+
 #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
 #define HAVE_PTHREAD_SIGMASK 1
 #define HAVE_PTHREAD_YIELD_ZERO_ARG 1
 #define HAVE_BROKEN_REALPATH 1
 
+#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
 /* no libc crypt() function */
 #ifdef HAVE_OPENSSL
   #define HAVE_CRYPT 1