diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-06-06 21:32:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-06-06 21:32:29 +0200 |
| commit | 72ba95873a6d99def07a4bfecda44fb942165142 (patch) | |
| tree | 4bcb11afc568c4894f4cb109d57c14968320a58b /include/my_pthread.h | |
| parent | fab9a55d077b4f2a511b273d5f51272f1e3dc1ff (diff) | |
| parent | 4749d40c635634e25e07d28ce1a04e9263bcc375 (diff) | |
| download | mariadb-git-72ba95873a6d99def07a4bfecda44fb942165142.tar.gz | |
10.0-base merge
(without InnoDB - all InnoDB changes were ignored)
Diffstat (limited to 'include/my_pthread.h')
| -rw-r--r-- | include/my_pthread.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 8c16a112eac..9e39c6565dc 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -119,7 +119,6 @@ int pthread_cancel(pthread_t thread); #define HAVE_LOCALTIME_R 1 #define _REENTRANT 1 #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1 -#define PTHREAD_STACK_MIN 65536 #undef SAFE_MUTEX /* This will cause conflicts */ #define pthread_key(T,V) DWORD V @@ -830,6 +829,11 @@ extern uint thd_lib_detected; #define mysql_mutex_record_order(A,B) do { } while(0) #endif +/* At least Windows and NetBSD do not have this definition */ +#ifndef PTHREAD_STACK_MIN +#define PTHREAD_STACK_MIN 65536 +#endif + #ifdef __cplusplus } #endif |