mirror of
https://github.com/MariaDB/server.git
synced 2026-05-02 21:25:36 +02:00
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/51-work storage/ndb/include/portlib/NdbMem.h: Auto merged storage/ndb/src/common/portlib/NdbMem.c: Auto merged storage/ndb/src/kernel/vm/Configuration.cpp: Auto merged storage/ndb/src/kernel/vm/Configuration.hpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: merge
This commit is contained in:
commit
7b184fa9dc
6 changed files with 33 additions and 10 deletions
|
|
@ -66,7 +66,7 @@ void NdbMem_Free(void* ptr);
|
|||
* NdbMem_MemLockAll
|
||||
* Locks virtual memory in main memory
|
||||
*/
|
||||
int NdbMem_MemLockAll(void);
|
||||
int NdbMem_MemLockAll(int);
|
||||
|
||||
/**
|
||||
* NdbMem_MemUnlockAll
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue