- up to 5.7.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/mysql.spec b/mysql.spec
index 3e55231669c237643301502a14edbdba8892af88..14bfdf9874b675b9f3b2614c7e6148fd35f56902 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -35,12 +35,12 @@ Summary(ru.UTF-8):  MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):     MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
-Version:       5.7.23
-Release:       2
+Version:       5.7.24
+Release:       1
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 Source0:       http://cdn.mysql.com/Downloads/MySQL-5.7/%{name}-%{version}.tar.gz
-# Source0-md5: 3398bb99df0ca926f161d56e9cefa73d
+# Source0-md5: 74de56f90a0f0a8496fe84b27117f32a
 Source100:     http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
 # Source100-md5:       5cac34f3d78a9d612ca4301abfcbd666
 %if %{without system_boost}
@@ -63,7 +63,6 @@ Source14:     my.cnf
 Patch0:                %{name}-opt.patch
 Patch1:                lz4.patch
 
-Patch16:       mysql-bug-91914.patch
 Patch17:       %{name}-5.7-sphinx.patch
 Patch18:       %{name}-sphinx.patch
 Patch19:       %{name}-chain-certs.patch
@@ -468,7 +467,6 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC.
 %patch0 -p1
 %patch1 -p1
 
-%patch16 -p1
 %if %{with sphinx}
 # http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51
 mv sphinx-*/mysqlse storage/sphinx