From b7de5ce8560507c26c06d2800617952f297309c9 Mon Sep 17 00:00:00 2001
From: si-gui <245140120@qq.com>
Date: Sat, 8 Aug 2020 17:52:50 +0800
Subject: [PATCH] upgrade to 8.0.21

---
 0000-mysql-add-fstack-protector-strong.patch | 23 ++++++++++++++------
 mysql.spec                                   |  9 +++++---
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/0000-mysql-add-fstack-protector-strong.patch b/0000-mysql-add-fstack-protector-strong.patch
index 23c07c8..0db0622 100644
--- a/0000-mysql-add-fstack-protector-strong.patch
+++ b/0000-mysql-add-fstack-protector-strong.patch
@@ -1,20 +1,29 @@
+From d770dfea36dcbe8d63ad0819e796d180ab2ea638 Mon Sep 17 00:00:00 2001
+
+---
+ cmake/build_configurations/compiler_options.cmake | 2 ++
+ 1 file changed, 2 insertions(+)
+
 diff --git a/cmake/build_configurations/compiler_options.cmake b/cmake/build_configurations/compiler_options.cmake
-index fecf2a2..f3e012f 100644
+index a319983..aea15a3 100644
 --- a/cmake/build_configurations/compiler_options.cmake
 +++ b/cmake/build_configurations/compiler_options.cmake
-@@ -43,6 +43,7 @@ IF(UNIX)
+@@ -45,6 +45,7 @@ IF(UNIX)
    # Default GCC flags
-   IF(CMAKE_COMPILER_IS_GNUCC)
+   IF(MY_COMPILER_IS_GNU)
      SET(COMMON_C_FLAGS               "-fno-omit-frame-pointer")
 +    SET(COMMON_C_FLAGS               "-fstack-protector-strong")
      # Disable inline optimizations for valgrind testing to avoid false positives
      IF(WITH_VALGRIND)
        STRING_PREPEND(COMMON_C_FLAGS  "-fno-inline ")
-@@ -57,6 +58,7 @@ IF(UNIX)
-   ENDIF()
-   IF(CMAKE_COMPILER_IS_GNUCXX)
-     SET(COMMON_CXX_FLAGS               "-std=c++14 -fno-omit-frame-pointer")
+@@ -55,6 +56,7 @@ IF(UNIX)
+     ENDIF()
+ 
+     SET(COMMON_CXX_FLAGS             "-std=c++14 -fno-omit-frame-pointer")
 +    SET(COMMON_CXX_FLAGS               "-fstack-protector-strong")
      # Disable inline optimizations for valgrind testing to avoid false positives
      IF(WITH_VALGRIND)
        STRING_PREPEND(COMMON_CXX_FLAGS  "-fno-inline ")
+-- 
+2.23.0
+
diff --git a/mysql.spec b/mysql.spec
index 3a53693..749f2f9 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -5,13 +5,12 @@
 %{nil}
 
 Name:              mysql
-Version:           8.0.17
-Release:           3
+Version:           8.0.21
+Release:           1
 License:           GPLv2
 Summary:           The world's most popular open source database
 URL:               http://www.mysql.com/
 Source0:           https://cdn.mysql.com/archives/%{name}-8.0/%{name}-boost-%{version}.tar.gz 
-
 Patch0000:         0000-mysql-add-fstack-protector-strong.patch
 BuildRequires:     cmake openssl-devel ncurses-devel libtirpc-devel rpcgen
 Requires:          libatomic >= 1.2.0 libstdc++ >= 7.3.0 ncurses libtirpc openssl
@@ -80,7 +79,11 @@ userdel -r %{name} &>/dev/null
 %exclude /usr/lib/debug
 
 %changelog
+* Sat Aug  8 2020 Guoshuai Sun <sunguoshuai@huawei.com> 8.0.21-1
+- Upgrade to 8.0.21
+
 * Wed Mar 1 2020 zhangtao<zhangtao221@huawei.com> 8.0.17-3
 - add fstack-protector-strong
+
 * Fri Feb 28 2020 catastrowings <jianghuhao1994@163.com> 8.0.17-2
 - openEuler package init.