---- mysql-3.23.32/configure.in.orig Sat Feb 10 02:57:16 2001
-+++ mysql-3.23.32/configure.in Sat Feb 10 03:21:04 2001
-@@ -1094,17 +1094,17 @@
- if test "$with_debug" = "yes"
- then
- # Medium debug.
-- CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS"
-- CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"
-+ CFLAGS="-DDBUG_ON -DSAFE_MUTEX $CFLAGS"
-+ CXXFLAGS="-DSAFE_MUTEX $CXXFLAGS"
- elif test "$with_debug" = "full"
- then
- # Full debug. Very slow in some cases
-- CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"
-- CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"
-+ CFLAGS="-DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"
-+ CXXFLAGS="-DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"
- else
- # Optimized version. No debug
-- CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"
-- CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"
-+ CFLAGS="-DDBUG_OFF $CFLAGS"
-+ CXXFLAGS="-DDBUG_OFF $CXXFLAGS"
- fi
+--- percona-server-5.6.24-72.2/cmake/build_configurations/compiler_options.cmake.orig 2015-05-06 12:38:47.000000000 +0200
++++ percona-server-5.6.24-72.2/cmake/build_configurations/compiler_options.cmake 2015-06-09 19:54:42.577790251 +0200
+@@ -30,8 +30,8 @@
+ IF(WITH_VALGRIND)
+ SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}")
+ ENDIF()
+- SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
+- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
++ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
++ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
+ ENDIF()
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+ SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
+@@ -39,20 +39,20 @@
+ IF(WITH_VALGRIND)
+ SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}")
+ ENDIF()
+- SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
+- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
++ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
++ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
+ ENDIF()
- # Force static compilation to avoid linking probles/get more speed
+ # Default Clang flags
+ IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
+ SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+- SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
+- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
++ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
++ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
+ ENDIF()
+ IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+- SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
+- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
++ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
++ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
+ ENDIF()
+
+ # Solaris flags