diff options
| -rwxr-xr-x | BUILD/compile-dist | 1 | ||||
| -rw-r--r-- | include/my_pthread.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/BUILD/compile-dist b/BUILD/compile-dist index f27c218747c..7c177f54258 100755 --- a/BUILD/compile-dist +++ b/BUILD/compile-dist @@ -43,5 +43,6 @@ fi --with-berkeley-db \ --with-innodb \ --enable-thread-safe-client \ + --with-extra-charsets=complex \ --with-ndbcluster make 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 { |