bk commit into 4.1 tree (lenz:1.2376)

[lenz]

Below is the list of changes that have just been committed into a local
4.1 repository of lenz. When lenz 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.2376 05/08/03 12:56:43 lenz@stripped +1 -0
  - reverted one DBUG_ENTER move, adjusted another one after review by Mikael
    (this ChangeSet will not be pushed, it is just an intermediate commit)

  ndb/src/common/portlib/NdbThread.c
    1.23 05/08/03 12:56:38 lenz@stripped +2 -2
    - reverted one DBUG_ENTER move, adjusted another one after review by Mikael

# 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:	lenz
# Host:	metis.lenznet
# Root:	/space/my/mysql-4.1-build

--- 1.22/ndb/src/common/portlib/NdbThread.c	2005-08-03 11:41:30 +02:00
+++ 1.23/ndb/src/common/portlib/NdbThread.c	2005-08-03 12:56:38 +02:00
@@ -41,6 +41,7 @@
 ndb_thread_wrapper(void* _ss){
   my_thread_init();
   {
+    DBUG_ENTER("ndb_thread_wrapper");
 #ifdef NDB_SHM_TRANSPORTER
     if (g_ndb_shm_signum)
     {
@@ -54,7 +55,6 @@
     {
       void *ret;
       struct NdbThread * ss = (struct NdbThread *)_ss;
-      DBUG_ENTER("ndb_thread_wrapper");
       ret= (* ss->func)(ss->object);
       DBUG_POP();
       NdbThread_Exit(ret);
@@ -74,9 +74,9 @@
   struct NdbThread* tmpThread;
   int result;
   pthread_attr_t thread_attr;
+  DBUG_ENTER("NdbThread_Create");
 
   (void)thread_prio; /* remove warning for unused parameter */
-  DBUG_ENTER("NdbThread_Create");
 
   if (p_thread_func == NULL)
     DBUG_RETURN(NULL);