- up to 5.7.23-24

diff --git a/mysql-bug-91914.patch b/mysql-bug-91914.patch
deleted file mode 100644 (file)
index ba588ce..0000000
--- a/mysql-bug-91914.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/regex/CMakeLists.txt b/regex/CMakeLists.txt
---- a/regex/CMakeLists.txt     2018-06-08 09:56:29.000000000 +0000
-+++ b/regex/CMakeLists.txt     2018-08-05 03:30:10.838781267 +0000
-@@ -15,6 +15,8 @@
- 
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
- 
-+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
-+
- MY_CHECK_C_COMPILER_FLAG("-Wstringop-truncation" HAVE_STRINGOP_TRUNCATION)
- IF(HAVE_STRINGOP_TRUNCATION)
-   ADD_COMPILE_FLAGS(

diff --git a/percona-server.spec b/percona-server.spec
index 1ce169ac7e79e952d909fa8e329d5c501be66c02..244c812c518e767282b8bfa8cb28192c4c2547b2 100644 (file)
--- a/percona-server.spec
+++ b/percona-server.spec
@@ -43,8 +43,8 @@
 %undefine      with_tokudb
 %endif
 
-%define                rel     2
-%define                percona_rel     23
+%define                rel     1
+%define                percona_rel     24
 %include       /usr/lib/rpm/macros.perl
 Summary:       Percona Server: a very fast and reliable SQL database engine
 Summary(de.UTF-8):     Percona Server: ist eine SQL-Datenbank
@@ -60,7 +60,7 @@ Release:      %{percona_rel}.%{rel}
 License:       GPL + Percona Server FLOSS Exception
 Group:         Applications/Databases
 Source0:       https://www.percona.com/downloads/Percona-Server-5.7/LATEST/source/tarball/%{name}-%{version}-%{percona_rel}.tar.gz
-# Source0-md5: 8bf4dca1bd9593803a48c522728ade50
+# Source0-md5: 5d8e7d4953217722335d3e7359978854
 Source100:     http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
 # Source100-md5:       5cac34f3d78a9d612ca4301abfcbd666
 %if %{without system_boost}
@@ -82,7 +82,6 @@ Source13:     %{name}-client.conf
 Source14:      my.cnf
 Patch0:                mysql-opt.patch
 Patch1:                mysql-versioning.patch
-Patch2:                mysql-bug-91914.patch
 
 Patch11:       mysql-upgrade.patch
 Patch12:       mysql-config.patch
@@ -496,8 +495,6 @@ Ten pakiet zawiera standardowego demona Percona Server NDB CPC.
 
 %patch0 -p1
 
-%patch2 -p1
-
 %if %{with sphinx}
 # http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51
 mv sphinx-*/mysqlse storage/sphinx