diff options
| author | unknown <lenz@mysql.com> | 2005-01-06 15:32:42 +0100 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-01-06 15:32:42 +0100 |
| commit | f40d29a23228d95c05f9720eaaa788a01aa830aa (patch) | |
| tree | 853c8b171c8e81aaf302abd83e91a964784a3a25 /include/my_pthread.h | |
| parent | 51cae387a9a2c67b0f6249864714b8659c951670 (diff) | |
| parent | 10844e41da65bd86a781e314a15a60b8b21d40d8 (diff) | |
| download | mariadb-git-f40d29a23228d95c05f9720eaaa788a01aa830aa.tar.gz | |
- Manually merged two changes from 4.0
BUILD/compile-dist:
- manual merge
include/my_pthread.h:
- manual merge
Diffstat (limited to 'include/my_pthread.h')
| -rw-r--r-- | include/my_pthread.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index cd0cf49a891..c4138a47b3c 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 @@ -640,6 +641,7 @@ extern int pthread_dummy(int); #else #define DEFAULT_THREAD_STACK (192*1024) #endif +#endif struct st_my_thread_var { |