summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <jani@a193-229-222-105.elisa-laajakaista.fi>2005-06-29 14:02:11 +0300
committerunknown <jani@a193-229-222-105.elisa-laajakaista.fi>2005-06-29 14:02:11 +0300
commit22711360ddd448a365583b47341542cabc8d57fc (patch)
tree22a71e8aaf5bae2706ffda1114cf4cc4b2f0eb01
parent1f2b008c432b76f4c377496164e80b9a0acf1a36 (diff)
downloadmariadb-git-22711360ddd448a365583b47341542cabc8d57fc.tar.gz
Applied some Netware related patches.
include/config-netware.h: Netware related fix. Some changes needed when building against latest libc (June 2005) netware/my_print_defaults.def: Stack size increase. sql/mysqld.cc: Needed with latest libc.
-rw-r--r--include/config-netware.h10
-rw-r--r--netware/my_print_defaults.def3
-rw-r--r--sql/mysqld.cc1
3 files changed, 13 insertions, 1 deletions
diff --git a/include/config-netware.h b/include/config-netware.h
index 4a6dc3b1bb9..906f557f608 100644
--- a/include/config-netware.h
+++ b/include/config-netware.h
@@ -46,11 +46,21 @@ extern "C" {
#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
diff --git a/netware/my_print_defaults.def b/netware/my_print_defaults.def
index 826981256b5..d88c5adf4cc 100644
--- a/netware/my_print_defaults.def
+++ b/netware/my_print_defaults.def
@@ -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
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 2dbc8fdac96..bc4cc81506e 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -140,6 +140,7 @@ int deny_severity = LOG_WARNING;
#define zVOLSTATE_DEACTIVE 2
#define zVOLSTATE_MAINTENANCE 3
+#include <nks/netware.h>
#include <nks/vm.h>
#include <library.h>
#include <monitor.h>