From 6fea54dd8ddb6ee0cd74a30ca6a503ec3919d073 Mon Sep 17 00:00:00 2001
From: "igor@hundin.mysql.fi" <>
Date: Tue, 28 Jan 2003 05:34:32 +0200
Subject: [PATCH] my_pthread.h:   Missing merge in changeset 1.1435

---
 BitKeeper/etc/logging_ok |  1 +
 include/my_pthread.h     | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 68e32884b01..cc11f43b899 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -26,6 +26,7 @@ hf@bison.(none)
 hf@bisonxp.(none)
 hf@deer.mysql.r18.ru
 hf@genie.(none)
+igor@hundin.mysql.fi
 jani@dsl-jkl1657.dial.inet.fi
 jani@dsl-kpogw4gb5.dial.inet.fi
 jani@hynda.(none)
diff --git a/include/my_pthread.h b/include/my_pthread.h
index 40013e07c0c..355d7c2e147 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -429,7 +429,7 @@ struct tm *localtime_r(const time_t *clock, struct tm *res);
 
 #endif /* defined(__WIN__) */
 
-#if defined(HPUX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)
+#if defined(HPUX10) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)
 #undef pthread_cond_timedwait
 #define pthread_cond_timedwait(a,b,c) my_pthread_cond_timedwait((a),(b),(c))
 int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
@@ -582,9 +582,13 @@ extern int pthread_dummy(int);
 
 #define THREAD_NAME_SIZE 10
 #if defined(__ia64__)
-#define DEFAULT_THREAD_STACK	(128*1024)
+/*
+  MySQL can survive with 32K, but some glibc libraries require > 128K stack
+  To resolve hostnames
+*/
+#define DEFAULT_THREAD_STACK	(192*1024L)
 #else
-#define DEFAULT_THREAD_STACK	(64*1024)
+#define DEFAULT_THREAD_STACK	(192*1024)
 #endif
 
 struct st_my_thread_var