summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <serg@sergbook.mysql.com>2005-01-06 17:40:00 +0200
committerunknown <serg@sergbook.mysql.com>2005-01-06 17:40:00 +0200
commit4532a89f0dc9d091dcfb408d0b225d118a9576f6 (patch)
treea623d3e82efd887c87ed3b4e00b0259e047614cf /include
parent1d6a4a54c7f6454dbf449c7e6807f7d3eae4a283 (diff)
parent574a2820cffb313eed606ff6e01162356a4bc3c4 (diff)
downloadmariadb-git-4532a89f0dc9d091dcfb408d0b225d118a9576f6.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to 'include')
-rw-r--r--include/my_pthread.h2
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
{