Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

CMakeLists.txt

@@ -250,6 +250,8 @@ endif ()
 find_package(PythonInterp 2 EXACT REQUIRED)
 get_filename_component(PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}" REALPATH)
 
+set($ENV{PYTHON_EXECUTABLE} ${PYTHON_EXECUTABLE})
+
 if (NOT WINDOWS)
   find_program(CHMOD_EXECUTABLE chmod)
   find_program(CHOWN_EXECUTABLE chown)
@@ -836,16 +838,11 @@ if (USE_MAINTAINER_MODE)
 
   foreach (m IN LISTS ERROR_FILES)
     add_custom_command(
-      OUTPUT
-        ${CMAKE_SOURCE_DIR}/${m}
-      COMMAND
-        PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} ./utils/generateErrorfile.sh ./${ERRORS_DAT} ./${m}
-      DEPENDS
-        ${CMAKE_SOURCE_DIR}/${ERRORS_DAT}
-      WORKING_DIRECTORY
-        ${CMAKE_SOURCE_DIR}
-      COMMENT
-        "Building errors files ${m}"
+      OUTPUT ${CMAKE_SOURCE_DIR}/${m}
+      COMMAND ./utils/generateErrorfile.sh ./${ERRORS_DAT} ./${m}
+      DEPENDS ${CMAKE_SOURCE_DIR}/${ERRORS_DAT}
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      COMMENT  "Building errors files ${m}"
       VERBATIM
     )
 
@@ -870,16 +867,11 @@ if (USE_MAINTAINER_MODE)
 
   foreach (m IN LISTS MIMETYPES_FILES)
     add_custom_command(
-      OUTPUT
-        ${CMAKE_SOURCE_DIR}/${m}
-      COMMAND
-        PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} ./utils/generateMimetypes.sh ./${MIMETYPES_DAT} ./${m}
-      DEPENDS
-        ${CMAKE_SOURCE_DIR}/${MIMETYPES_DAT}
-      WORKING_DIRECTORY
-        ${CMAKE_SOURCE_DIR}
-      COMMENT
-        "Building mimetypes files ${m}"
+      OUTPUT ${CMAKE_SOURCE_DIR}/${m}
+      COMMAND ./utils/generateMimetypes.sh ./${MIMETYPES_DAT} ./${m}
+      DEPENDS ${CMAKE_SOURCE_DIR}/${MIMETYPES_DAT}
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      COMMENT "Building mimetypes files ${m}"
       VERBATIM
     )
 

arangod/RestHandler/RestReplicationHandler.cpp

@@ -2670,7 +2670,7 @@ void RestReplicationHandler::handleCommandRestoreDataCoordinator() {
   }
 
   if (res != TRI_ERROR_NO_ERROR) {
-    THROW_ARANGO_EXCEPTION(res);
+    THROW_ARANGO_EXCEPTION_Message(res, errorMessage);
   }
 
   VPackBuilder result;

lib/Basics/IndexBucket.h

@@ -140,6 +140,8 @@ struct IndexBucket {
       TRI_ASSERT(_file == -1);
       throw;
     }
+
+    _nrCollisions = 0;
   }
 
   void deallocate() {
@@ -206,6 +208,7 @@ struct IndexBucket {
     _table = nullptr;
     _nrAlloc = 0;
     _nrUsed = 0;
+    _nrCollisions = 0;
   }
 
   int allocateTempfile(char*& filename, size_t filesize) {