Commit d9adebfa authored by unknown's avatar unknown
Browse files

Merge 


include/my_pthread.h:
  fix merge conflict
parents 6f2f0d5c 3edb7774

include/my_pthread.h

+3 −1
Original line number Diff line number Diff line
@@ -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
@@ -638,7 +639,8 @@ extern int pthread_dummy(int); 
*/

#define DEFAULT_THREAD_STACK	(192*1024L)

#else

#define DEFAULT_THREAD_STACK	(192*1024)

#define DEFAULT_THREAD_STACK	(192*1024L)

#endif

#endif



struct st_my_thread_var