bk commit into 5.1 tree (tomas:1.1958)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1958 05/11/30 12:37:17 tomas@stripped +1 -0
  compiler dependent fix

  storage/ndb/src/common/portlib/NdbThread.c
    1.34 05/11/30 12:37:10 tomas@stripped +2 -4
    compiler dependent fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-5.0

--- 1.33/storage/ndb/src/common/portlib/NdbThread.c	2005-11-21 16:59:07 +01:00
+++ 1.34/storage/ndb/src/common/portlib/NdbThread.c	2005-11-30 12:37:10 +01:00
@@ -91,13 +91,14 @@
 
 struct NdbThread* NdbThread_Create(NDB_THREAD_FUNC *p_thread_func,
                       NDB_THREAD_ARG *p_thread_arg,
-  		      const NDB_THREAD_STACKSIZE thread_stack_size,
+  		      const NDB_THREAD_STACKSIZE _thread_stack_size,
 		      const char* p_thread_name,
                       NDB_THREAD_PRIO thread_prio)
 {
   struct NdbThread* tmpThread;
   int result;
   pthread_attr_t thread_attr;
+  NDB_THREAD_STACKSIZE thread_stack_size= _thread_stack_size * SIZEOF_CHARP/4;
   DBUG_ENTER("NdbThread_Create");
 
   (void)thread_prio; /* remove warning for unused parameter */
@@ -114,9 +115,6 @@
   strnmov(tmpThread->thread_name,p_thread_name,sizeof(tmpThread->thread_name));
 
   pthread_attr_init(&thread_attr);
-#if (SIZEOF_CHARP == 8)
-  thread_stack_size *= 2;
-#endif
 #ifdef PTHREAD_STACK_MIN
   if (thread_stack_size < PTHREAD_STACK_MIN)
     thread_stack_size = PTHREAD_STACK_MIN;