diff options
| author | unknown <igor@hundin.mysql.fi> | 2003-01-28 05:34:32 +0200 |
|---|---|---|
| committer | unknown <igor@hundin.mysql.fi> | 2003-01-28 05:34:32 +0200 |
| commit | aa42950eb096ada3592e68165992b5e84ebcfc87 (patch) | |
| tree | 5bd439ca48743105ee6b118e5e5d7dbef24da305 | |
| parent | be85fdc5d03c1d85a16c392dae955de12c9611ac (diff) | |
| download | mariadb-git-aa42950eb096ada3592e68165992b5e84ebcfc87.tar.gz | |
my_pthread.h:
Missing merge in changeset 1.1435
include/my_pthread.h:
Missing merge in changeset 1.1435
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | 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 |