diff options
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | ndb/src/common/portlib/unix/NdbMem.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 35ea9b2f778..809450042a1 100644 --- a/BitKeeper/etc/logging_ok +++ b/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 diff --git a/ndb/src/common/portlib/unix/NdbMem.c b/ndb/src/common/portlib/unix/NdbMem.c index 4ddb5b52ecd..ce422f45a9d 100644 --- a/ndb/src/common/portlib/unix/NdbMem.c +++ b/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(); |