Merge branch 'mysql-5.5' into mysql-5.6

Author: Tor Didriksen

CMakeLists.txt

@@ -288,11 +288,9 @@ IF (WITH_ASAN)
   ENDIF()
 ENDIF()
 
-
-IF(CMAKE_BUILD_TYPE MATCHES "Debug" OR WITH_DEBUG)
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC") 
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC") 
-ENDIF() 
+# Always enable debug sync for debug builds.
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
+SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
 
 # Older versions of ccache must be disabled: export CCACHE_DISABLE=1
 # See http://www.cmake.org/Uncyclo/CTest/Coverage