From 84aa570ddfc8a0ad04ecbf0a163492f1209b336b Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 29 Jun 2005 14:02:11 +0300 Subject: [PATCH] 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. --- include/config-netware.h | 10 ++++++++++ netware/my_print_defaults.def | 3 ++- sql/mysqld.cc | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) 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 #include #include #include