- up to 5.6.51; 43594 seems to be fixed

[packages/mysql.git] / mysql-opt.patch

diff --git a/mysql-opt.patch b/mysql-opt.patch
index c7db34311b1b452584d66a12d16c11ac99359182..c317a6e3e0be0af85f49f28c9e2e3ce0e00ff398 100644 (file)
--- a/mysql-opt.patch
+++ b/mysql-opt.patch
@@ -1,6 +1,6 @@
 --- 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 @@
+@@ -37,8 +37,8 @@
      IF(WITH_VALGRIND)
        SET(COMMON_C_FLAGS             "-fno-inline ${COMMON_C_FLAGS}")
      ENDIF()
@@ -10,7 +10,7 @@
 +    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")
+     # GCC 6 has C++14 as default, set it explicitly to the old default.
 @@ -52,26 +52,26 @@ IF(UNIX)
      IF(WITH_VALGRIND)
        SET(COMMON_CXX_FLAGS             "-fno-inline ${COMMON_CXX_FLAGS}")