bzr commit into mysql-5.1 branch (msvensson:2785)

[Magnus Svensson]

#At file:///home/msvensson/mysql/tmp/K5JIWbjgVK/mysql-5.1-telco-6.2/ based on revid:jonas@stripped

 2785 Magnus Svensson	2009-01-07 [merge]
      Merge
modified:
  storage/ndb/src/common/portlib/NdbThread.c

=== modified file 'storage/ndb/src/common/portlib/NdbThread.c'
--- a/storage/ndb/src/common/portlib/NdbThread.c	2006-12-23 19:20:40 +0000
+++ b/storage/ndb/src/common/portlib/NdbThread.c	2008-12-12 11:05:58 +0000
@@ -39,11 +39,10 @@ struct NdbThread 
 #ifdef NDB_SHM_TRANSPORTER
 void NdbThread_set_shm_sigmask(my_bool block)
 {
-  DBUG_ENTER("NdbThread_set_shm_sigmask");
   if (g_ndb_shm_signum)
   {
     sigset_t mask;
-    DBUG_PRINT("info",("Block signum %d",g_ndb_shm_signum));
+    // DBUG_PRINT("info",("Block signum %d",g_ndb_shm_signum));
     sigemptyset(&mask);
     sigaddset(&mask, g_ndb_shm_signum);
     if (block)
@@ -51,7 +50,7 @@ void NdbThread_set_shm_sigmask(my_bool b
     else
       pthread_sigmask(SIG_UNBLOCK, &mask, 0);
   }
-  DBUG_VOID_RETURN;
+  return;
 }
 #endif