Merge

include/my_pthread.h: fix merge conflict

Merge
include/my_pthread.h: fix merge conflict
d9adebfa · unknown · 6f2f0d5c · 3edb7774 · d9adebfa
Commit d9adebfa authored Jan 05, 2005 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

include/my_pthread.h include/my_pthread.h +3 -1

No files found.
--- 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
@@ -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