Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb

into ndbmaster.mysql.com:/ndb/clone-4.1-ndb-daily


BitKeeper/etc/logging_ok:
  auto-union

BitKeeper/etc/logging_ok

@@ -112,6 +112,7 @@ mwagner@work.mysql.com
 mydev@mysql.com
 mysql@home.(none)
 mysqldev@build.mysql2.com
+ndbdev@ndbmaster.mysql.com
 nick@mysql.com
 nick@nick.leippe.com
 papa@gbichot.local

ndb/src/common/portlib/unix/NdbMem.c

@@ -54,7 +54,7 @@ void NdbMem_Free(void* ptr)
 
  
 int NdbMem_MemLockAll(){
-#ifdef HAVE_MLOCKALL
+#ifndef HAVE_MLOCKALL
   return -1;
 #else
   return mlockall(MCL_CURRENT);
@@ -62,7 +62,7 @@ int NdbMem_MemLockAll(){
 }
 
 int NdbMem_MemUnlockAll(){
-#ifdef HAVE_MLOCKALL
+#ifndef HAVE_MLOCKALL
   return -1;
 #else
   return munlockall();