mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
my_pthread.h:
Missing merge in changeset 1.1435
This commit is contained in:
@ -26,6 +26,7 @@ hf@bison.(none)
|
|||||||
hf@bisonxp.(none)
|
hf@bisonxp.(none)
|
||||||
hf@deer.mysql.r18.ru
|
hf@deer.mysql.r18.ru
|
||||||
hf@genie.(none)
|
hf@genie.(none)
|
||||||
|
igor@hundin.mysql.fi
|
||||||
jani@dsl-jkl1657.dial.inet.fi
|
jani@dsl-jkl1657.dial.inet.fi
|
||||||
jani@dsl-kpogw4gb5.dial.inet.fi
|
jani@dsl-kpogw4gb5.dial.inet.fi
|
||||||
jani@hynda.(none)
|
jani@hynda.(none)
|
||||||
|
@ -429,7 +429,7 @@ struct tm *localtime_r(const time_t *clock, struct tm *res);
|
|||||||
|
|
||||||
#endif /* defined(__WIN__) */
|
#endif /* defined(__WIN__) */
|
||||||
|
|
||||||
#if defined(HPUX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)
|
#if defined(HPUX10) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)
|
||||||
#undef pthread_cond_timedwait
|
#undef pthread_cond_timedwait
|
||||||
#define pthread_cond_timedwait(a,b,c) my_pthread_cond_timedwait((a),(b),(c))
|
#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,
|
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
|
#define THREAD_NAME_SIZE 10
|
||||||
#if defined(__ia64__)
|
#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
|
#else
|
||||||
#define DEFAULT_THREAD_STACK (64*1024)
|
#define DEFAULT_THREAD_STACK (192*1024)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
struct st_my_thread_var
|
struct st_my_thread_var
|
||||||
|
Reference in New Issue
Block a user