diff options
| author | unknown <serg@sergbook.mysql.com> | 2005-01-06 19:32:16 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2005-01-06 19:32:16 +0200 |
| commit | 382cc831de2ef50966fd3fd2b8157bcc5727dde3 (patch) | |
| tree | bc5f2396178536c669ed27714be84b79612c0f6b /include | |
| parent | 6b584127af84fe362539af068a505fc3f5e28925 (diff) | |
| parent | 4532a89f0dc9d091dcfb408d0b225d118a9576f6 (diff) | |
| download | mariadb-git-382cc831de2ef50966fd3fd2b8157bcc5727dde3.tar.gz | |
merged
BitKeeper/etc/ignore:
auto-union
include/my_pthread.h:
Auto merged
innobase/os/os0file.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
merged manually
Diffstat (limited to 'include')
| -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 b483b68d5cb..57240788e2f 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 { |