Skip to content

M
mariadb
Commit d9adebfa authored by unknown's avatar unknown
Browse files
Options

Merge 


include/my_pthread.h:
  fix merge conflict
parents 6f2f0d5c 3edb7774
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
include/my_pthread.h
View file @ d9adebfa
...@@ -631,6 +631,7 @@ extern int pthread_dummy(int); ...@@ -631,6 +631,7 @@ extern int pthread_dummy(int);
/* All thread specific variables are in the following struct */ /* All thread specific variables are in the following struct */
#define THREAD_NAME_SIZE 10 #define THREAD_NAME_SIZE 10
#ifndef DEFAULT_THREAD_STACK
#if defined(__ia64__) #if defined(__ia64__)
/* /*
MySQL can survive with 32K, but some glibc libraries require > 128K stack MySQL can survive with 32K, but some glibc libraries require > 128K stack
...@@ -638,7 +639,8 @@ extern int pthread_dummy(int); ...@@ -638,7 +639,8 @@ extern int pthread_dummy(int);
*/ */
#define DEFAULT_THREAD_STACK (192*1024L) #define DEFAULT_THREAD_STACK (192*1024L)
#else #else
#define DEFAULT_THREAD_STACK (192*1024) #define DEFAULT_THREAD_STACK (192*1024L)
#endif
#endif #endif
struct st_my_thread_var struct st_my_thread_var
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7