Commit f40d29a2 authored by unknown's avatar unknown
Browse files

- Manually merged two changes from 4.0 


BUILD/compile-dist:
  - manual merge
include/my_pthread.h:
  - manual merge
parents 51cae387 10844e41

BUILD/compile-dist

+1 −0
Original line number Diff line number Diff line
@@ -43,5 +43,6 @@ fi 
  --with-berkeley-db \

  --with-innodb \

  --enable-thread-safe-client \

  --with-extra-charsets=complex \

  --with-ndbcluster

make

include/my_pthread.h

+2 −0
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
@@ -640,6 +641,7 @@ extern int pthread_dummy(int); 
#else

#define DEFAULT_THREAD_STACK	(192*1024)

#endif

#endif



struct st_my_thread_var

{