Commit cb179dd3 authored by unknown's avatar unknown
Browse files

Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 

into trift-lap.fambruehe:/MySQL/M51/work-5.1


mysql-test/r/skip_name_resolve.result:
  Auto merged
mysql-test/t/skip_name_resolve.test:
  Auto merged
parents 36ceef6a ed1efa7c

include/my_pthread.h

+2 −2
Original line number Diff line number Diff line
@@ -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