diff options
| author | unknown <jimw@mysql.com> | 2005-01-05 19:22:58 +0100 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-05 19:22:58 +0100 |
| commit | d9adebfa2420e2c093ec198c80def43cae8b3902 (patch) | |
| tree | f0e5d9ca33637f81bd236d436d608615343ca4a4 | |
| parent | 6f2f0d5cf3a7cb9a638bc753a3f3ec1b518bc4ed (diff) | |
| parent | 3edb7774edf059834cb6b29fc4a9634802ea7dc7 (diff) | |
| download | mariadb-git-d9adebfa2420e2c093ec198c80def43cae8b3902.tar.gz | |
Merge
include/my_pthread.h:
fix merge conflict
| -rw-r--r-- | include/my_pthread.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index cd0cf49a891..40154f5b8d8 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -631,6 +631,7 @@ extern int pthread_dummy(int); /* All thread specific variables are in the following struct */ #define THREAD_NAME_SIZE 10 +#ifndef DEFAULT_THREAD_STACK #if defined(__ia64__) /* MySQL can survive with 32K, but some glibc libraries require > 128K stack @@ -638,7 +639,8 @@ extern int pthread_dummy(int); */ #define DEFAULT_THREAD_STACK (192*1024L) #else -#define DEFAULT_THREAD_STACK (192*1024) +#define DEFAULT_THREAD_STACK (192*1024L) +#endif #endif struct st_my_thread_var |