bzr push into mysql-5.1 branch (jonas:3046 to 3047)

[Jonas Oreland]

 3047 Jonas Oreland	2008-11-06
      ndb - restore incorrectly remove #ifdef for windows
modified:
  storage/ndb/src/common/portlib/NdbThread.c

 3046 Magnus Svensson	2008-11-06 [merge]
      Merge
modified:
  storage/ndb/include/portlib/NdbThread.h
  storage/ndb/include/transporter/TransporterRegistry.hpp
  storage/ndb/include/util/SocketServer.hpp
  storage/ndb/src/common/portlib/NdbThread.c
  storage/ndb/src/common/transporter/TransporterRegistry.cpp
  storage/ndb/src/common/util/SocketServer.cpp
  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp
  storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
  storage/ndb/src/kernel/main.cpp
  storage/ndb/src/kernel/vm/Configuration.cpp
  storage/ndb/src/kernel/vm/Configuration.hpp
  storage/ndb/src/kernel/vm/DynArr256.cpp
  storage/ndb/src/kernel/vm/WatchDog.cpp
  storage/ndb/src/kernel/vm/WatchDog.hpp
  storage/ndb/src/ndbapi/TransporterFacade.cpp
  storage/ndb/test/ndbapi/testMgm.cpp
  storage/ndb/test/ndbapi/testNodeRestart.cpp
  storage/ndb/test/ndbapi/testScanFilter.cpp
  storage/ndb/test/ndbapi/test_event_merge.cpp

=== modified file 'storage/ndb/src/common/portlib/NdbThread.c'
--- a/storage/ndb/src/common/portlib/NdbThread.c	2008-11-06 10:17:49 +0000
+++ b/storage/ndb/src/common/portlib/NdbThread.c	2008-11-06 15:00:44 +0000
@@ -118,6 +118,8 @@ ndb_thread_wrapper(void* _ss){
 #ifdef NDB_SHM_TRANSPORTER
     NdbThread_set_shm_sigmask(TRUE);
 #endif
+
+#ifdef HAVE_PTHREAD_SIGMASK
     {
       /**
        * Block all signals to thread by default
@@ -127,6 +129,7 @@ ndb_thread_wrapper(void* _ss){
       sigfillset(&mask);
       pthread_sigmask(SIG_BLOCK, &mask, 0);
     }      
+#endif
 
     {
       void *ret;