Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

storage/ndb/include/portlib/NdbThread.h

@@ -41,7 +41,7 @@ struct NdbThread;
   signum set in g_ndb_shm_signum in a portable manner.
 */
 #ifdef NDB_SHM_TRANSPORTER
-void NdbThread_set_shm_sigmask(bool block);
+void NdbThread_set_shm_sigmask(my_bool block);
 #endif
 
 /**