diff options
| author | unknown <joerg@trift-lap.fambruehe> | 2005-12-15 12:10:00 +0100 |
|---|---|---|
| committer | unknown <joerg@trift-lap.fambruehe> | 2005-12-15 12:10:00 +0100 |
| commit | ed1efa7c542cda031104c0875b234fd2329e0b53 (patch) | |
| tree | ec3bbbd46313f26a05e457920b0679f96d23b1d6 /include | |
| parent | bb2337038992f63f38ff22b9a2d8136059fc115a (diff) | |
| parent | 63a2714451e01395e2c21949e07447da59805ed6 (diff) | |
| download | mariadb-git-ed1efa7c542cda031104c0875b234fd2329e0b53.tar.gz | |
Merge joerg@trift2:/M50/part3-kent-joerg
into trift-lap.fambruehe:/MySQL/M51/merge-5.1
mysql-test/r/skip_name_resolve.result:
Auto merged
mysql-test/t/skip_name_resolve.test:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 6f60a6df2c1..202e047dc4e 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -643,10 +643,10 @@ extern int pthread_dummy(int); #define THREAD_NAME_SIZE 10 #ifndef DEFAULT_THREAD_STACK -#if defined(__ia64__) +#if SIZEOF_CHARP > 4 /* MySQL can survive with 32K, but some glibc libraries require > 128K stack - To resolve hostnames + To resolve hostnames. Also recursive stored procedures needs stack. */ #define DEFAULT_THREAD_STACK (256*1024L) #else |