- updated to 5.7.25-28, merged opt patch from PLD

diff --git a/mysql-opt.patch b/mysql-opt.patch
index eaa5c4e71b752237a11b9b65c1bad35eeb1b7a18..bc2de8e53ab40d24c0f5db502b191173666bc9b0 100644 (file)
--- a/mysql-opt.patch
+++ b/mysql-opt.patch
@@ -1,47 +1,6 @@
---- percona-server-5.7.12-5/cmake/build_configurations/compiler_options.cmake~ 2016-06-19 22:55:34.000000000 +0300
-+++ percona-server-5.7.12-5/cmake/build_configurations/compiler_options.cmake  2016-06-19 22:58:00.531159698 +0300
-@@ -33,8 +33,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 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}")
-+    SET(CMAKE_C_FLAGS_DEBUG          "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
-+    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${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")
-@@ -42,20 +42,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 -D_FORTIFY_SOURCE=2 ${COMMON_CXX_FLAGS}")
-+    SET(CMAKE_CXX_FLAGS_DEBUG          "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
-+    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
-   ENDIF()
- 
-   # 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 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}")
-+    SET(CMAKE_C_FLAGS_DEBUG          "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
-+    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_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 -D_FORTIFY_SOURCE=2 ${COMMON_CXX_FLAGS}")
-+    SET(CMAKE_CXX_FLAGS_DEBUG          "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
-+    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
-   ENDIF()
- 
-   # Solaris flags
-
---- percona-server-5.7.23-23/cmake/build_configurations/compiler_options.cmake.orig    2018-10-14 08:44:45.291573886 +0200
-+++ percona-server-5.7.23-23/cmake/build_configurations/compiler_options.cmake 2018-10-14 08:44:55.181573772 +0200
-@@ -25,17 +25,17 @@
+--- percona-server-5.7.25-28/cmake/build_configurations/compiler_options.cmake.orig    2019-02-18 07:11:31.000000000 +0100
++++ percona-server-5.7.25-28/cmake/build_configurations/compiler_options.cmake 2019-02-28 06:43:42.913206001 +0100
+@@ -25,17 +25,17 @@ IF(SIZEOF_VOIDP EQUAL 8)
    SET(64BIT 1)
  ENDIF()
  
@@ -64,12 +23,39 @@
      ENDIF()
    ENDIF()
  
-@@ -140,7 +140,7 @@
+@@ -61,8 +61,8 @@ IF(UNIX)
+     IF(C_NO_EXPENSIVE_OPTIMIZATIONS)
+       SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -fno-expensive-optimizations")
+     ENDIF()
+-    SET(CMAKE_C_FLAGS_DEBUG          "${COMMON_C_FLAGS}")
+-    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}")
++    SET(CMAKE_C_FLAGS_DEBUG          "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
++    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${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")
+@@ -95,8 +95,8 @@ IF(UNIX)
+   # 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 -D_FORTIFY_SOURCE=2 ${COMMON_C_FLAGS}")
++    SET(CMAKE_C_FLAGS_DEBUG          "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
++    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_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")
+@@ -146,10 +146,10 @@ IF(UNIX)
  
        SET(COMMON_C_FLAGS            "-g ${SUNPRO_FLAGS}")
        SET(COMMON_CXX_FLAGS          "-g0 ${SUNPRO_FLAGS}")
 -      SET(COMMON_CXX_FLAGS          "${COMMON_CXX_FLAGS} -std=c++03")
+-      SET(CMAKE_C_FLAGS_DEBUG       "${COMMON_C_FLAGS}")
 +      SET(COMMON_CXX_FLAGS          "${COMMON_CXX_FLAGS} -std=c++11")
-       SET(CMAKE_C_FLAGS_DEBUG       "${COMMON_C_FLAGS}")
++      SET(CMAKE_C_FLAGS_DEBUG       "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
        SET(CMAKE_CXX_FLAGS_DEBUG     "${COMMON_CXX_FLAGS}")
-       SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-xO3 ${COMMON_C_FLAGS}")
+-      SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-xO3 ${COMMON_C_FLAGS}")
++      SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-xO3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
+       SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_CXX_FLAGS}")
+     ENDIF()
+   ENDIF()

diff --git a/mysql.spec b/mysql.spec
index ceea23213244cd57288f451c21528944d5d16667..989a4fc734f0d116396c6d801f99432bcbedfbea 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -43,8 +43,8 @@
 %undefine      with_tokudb
 %endif
 
-%define                rel     2
-%define                percona_rel     27
+%define                rel     1
+%define                percona_rel     28
 %include       /usr/lib/rpm/macros.perl
 Summary:       MySQL: a very fast and reliable SQL database engine
 Summary(de.UTF-8):     MySQL: ist eine SQL-Datenbank
@@ -55,12 +55,12 @@ Summary(ru.UTF-8):  MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):     MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
-Version:       5.7.24
+Version:       5.7.25
 Release:       %{percona_rel}.%{rel}
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 Source0:       https://www.percona.com/downloads/Percona-Server-5.7/LATEST/source/tarball/percona-server-%{version}-%{percona_rel}.tar.gz
-# Source0-md5: 67dbcfe11202be3486ac54018c217ab5
+# Source0-md5: 9dbfe24ec6330c1b9831c42ff6b2e265
 Source100:     http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
 # Source100-md5:       5cac34f3d78a9d612ca4301abfcbd666
 %if %{without system_boost}