Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

NULL

This commit is contained in:
Jan Steemann 2014-06-24 16:31:19 +02:00
parent cf14609727
commit 0d75f16e09
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/RestServer/ArangoServer.cpp
View File

@ -1116,7 +1116,7 @@ void ArangoServer::openDatabases (bool checkVersion,
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
if (checkVersion && res == TRI_ERROR_ARANGO_EMPTY_DATADIR) { if (checkVersion && res == TRI_ERROR_ARANGO_EMPTY_DATADIR) {
TRI_EXIT_FUNCTION(EXIT_SUCCESS, NULL); TRI_EXIT_FUNCTION(EXIT_SUCCESS, nullptr);
} }
LOG_FATAL_AND_EXIT("cannot start server: %s", TRI_errno_string(res)); LOG_FATAL_AND_EXIT("cannot start server: %s", TRI_errno_string(res));

2
arangod/Wal/SynchroniserThread.cpp
View File

@ -183,7 +183,7 @@ int SynchroniserThread::doSync () {
// get the logfile's file descriptor // get the logfile's file descriptor
int fd = getLogfileDescriptor(region.logfileId); int fd = getLogfileDescriptor(region.logfileId);
TRI_ASSERT(fd >= 0); TRI_ASSERT(fd >= 0);
void** mmHandle = NULL; void** mmHandle = nullptr;
bool result = TRI_MSync(fd, mmHandle, region.mem, region.mem + region.size); bool result = TRI_MSync(fd, mmHandle, region.mem, region.mem + region.size);
LOG_TRACE("syncing logfile %llu, region %p - %p, length: %lu, wfs: %s", LOG_TRACE("syncing logfile %llu, region %p - %p, length: %lu, wfs: %s",