bk commit into 4.1 tree (lenz:1.2374)

[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.2374 05/08/03 11:41:34 lenz@stripped +2 -0
  - Moved some DBUG_ENTER statements after the variable declarations to satisfy some
    compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r)

  ndb/src/common/portlib/NdbThread.c
    1.22 05/08/03 11:41:30 lenz@stripped +2 -2
    - Moved some DBUG_ENTER statements after the variable declarations to satisfy some
      compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r)

  ndb/src/common/portlib/NdbMutex.c
    1.7 05/08/03 11:41:30 lenz@stripped +2 -2
    - Moved some DBUG_ENTER statements after the variable declarations to satisfy some
      compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r)

# 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.6/ndb/src/common/portlib/NdbMutex.c	2005-07-14 17:54:32 +02:00
+++ 1.7/ndb/src/common/portlib/NdbMutex.c	2005-08-03 11:41:30 +02:00
@@ -23,9 +23,9 @@
 
 NdbMutex* NdbMutex_Create(void)
 {
-  DBUG_ENTER("NdbMutex_Create");
   NdbMutex* pNdbMutex;
   int result;
+  DBUG_ENTER("NdbMutex_Create");
   
   pNdbMutex = (NdbMutex*)NdbMem_Allocate(sizeof(NdbMutex));
   DBUG_PRINT("info",("NdbMem_Allocate 0x%lx",pNdbMutex));
@@ -42,8 +42,8 @@
 
 int NdbMutex_Destroy(NdbMutex* p_mutex)
 {
-  DBUG_ENTER("NdbMutex_Destroy");
   int result;
+  DBUG_ENTER("NdbMutex_Destroy");
 
   if (p_mutex == NULL)
     DBUG_RETURN(-1);

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