merge

CMakeLists.txt

@@ -103,17 +103,22 @@ IF(WITH_ERROR_INJECT)
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DERROR_INJECT_SUPPORT") 
 ENDIF() 
 
-
-
 OPTION(ENABLE_LOCAL_INFILE
  "If we should should enable LOAD DATA LOCAL by default" ${IF_WIN})
 MARK_AS_ADVANCED(ENABLE_LOCAL_INFILE)
 
-# Set DBUG_OFF for non-debug project types.
+OPTION(WITH_FAST_MUTEXES "Compile with fast mutexes" OFF)
+MARK_AS_ADVANCED(WITH_FAST_MUTEXES)
+
+# Set DBUG_OFF and other optional release-only flags for non-debug project types
 FOREACH(BUILD_TYPE RELEASE RELWITHDEBINFO MINSIZEREL)
   FOREACH(LANG C CXX)
     SET(CMAKE_${LANG}_FLAGS_${BUILD_TYPE} 
      "${CMAKE_${LANG}_FLAGS_${BUILD_TYPE}} -DDBUG_OFF")
+    IF(WITH_FAST_MUTEXES)
+      SET(CMAKE_${LANG}_FLAGS_${BUILD_TYPE} 
+        "${CMAKE_${LANG}_FLAGS_${BUILD_TYPE}} -DMY_PTHREAD_FASTMUTEX=1")
+    ENDIF()
   ENDFOREACH()
 ENDFOREACH()