!40 upgrade to 8.0.24

From: @jackie_wu123
Reviewed-by: 
Signed-off-by:

mysql-arm32-timer.patch

@@ -1,14 +1,14 @@
---- mysql-8.0.22/mysql-test/include/mtr_warnings.sql.old	2020-10-21 11:25:49.779775116 +0200
-+++ mysql-8.0.22/mysql-test/include/mtr_warnings.sql	2020-10-21 11:26:29.507185307 +0200
-@@ -299,6 +299,11 @@
-  ("NOTIFY_SOCKET not set in environment. sd_notify messages will not be sent!"),
+--- mysql-8.0.24-bak/mysql-test/include/mtr_warnings.sql	2021-03-22 16:44:50.000000000 +0800
++++ mysql-8.0.24/mysql-test/include/mtr_warnings.sql	2021-05-07 10:58:00.852352992 +0800
+@@ -304,6 +304,11 @@
   ("Invalid systemd notify socket, cannot send: "),
  
-+ /*
+  /*
 +   ARM32 don't support timers and get this warning in every test.
 + */
 + ("The CYCLE timer is not available. WAIT events in the performance_schema will not be timed."),
 +
-  ("THE_LAST_SUPPRESSION");
- 
- 
++ /*
+    Manifest file processing
+  */
+  ("Manifest file '.*' is not read-only. For better security, please make sure that the file is read-only."),

mysql-gcc11.patch

@@ -1,25 +0,0 @@
-index a826a081..00000000
-diff --git a/include/mysql/components/services/page_track_service.h b/include/mysql/components/services/page_track_service.h
-index 103b5135..e6b3ba6f 100644
---- a/include/mysql/components/services/page_track_service.h
-+++ b/include/mysql/components/services/page_track_service.h
-@@ -26,6 +26,7 @@
- 
- #include <mysql/components/service.h>
- #include <functional>
-+#include <cstddef>
- 
- #include <stdint.h>
- 
-diff --git a/sql-common/sql_string.cc b/sql-common/sql_string.cc
-index 40435729..8b6ee827 100644
---- a/sql-common/sql_string.cc
-+++ b/sql-common/sql_string.cc
-@@ -23,6 +23,7 @@
- #include "sql_string.h"
- 
- #include <algorithm>
-+#include <limits>
- 
- #include "my_dbug.h"
- #include "my_macros.h"

mysql-main-cast.patch

@@ -1,48 +0,0 @@
-commit 68730acd9ae7ae8b2fcd25b5ccd18d47038d00b9
-Author: Catalin Besleaga <catalin.besleaga@oracle.com>
-Date:   Mon Jan 4 14:32:05 2021 +0100
-
-    WL#14015: Follow-up: fixed unstable test
-
-    Change-Id: I11f352168902c6689981131cfda3a87ba924941c
-
-diff --git a/mysql-test/r/cast.result b/mysql-test/r/cast.result
-index af82329a9c5..4d81ef111cb 100644
---- a/mysql-test/r/cast.result
-+++ b/mysql-test/r/cast.result
-@@ -1747,6 +1747,7 @@ CAST("2020extra" AS YEAR)
- 2020
- Warnings:
- Warning	1292	Truncated incorrect YEAR value: '2020extra'
-+SET timestamp = UNIX_TIMESTAMP('2020-12-22 03:30:00');
- SELECT CAST(TIMESTAMP'2010-01-01 00:00' AS YEAR);
- CAST(TIMESTAMP'2010-01-01 00:00' AS YEAR)
- 2010
-@@ -1764,6 +1765,7 @@ CAST(TIME'08:09:10' AS YEAR)
- SELECT CAST(TIME'00:00:00' AS YEAR);
- CAST(TIME'00:00:00' AS YEAR)
- 2020
-+SET timestamp = DEFAULT;
- SELECT CAST(ST_PointFromText('POINT(10 10)') AS YEAR);
- ERROR HY000: Incorrect arguments to cast_as_year
- CREATE TABLE t AS SELECT CAST("2010" AS YEAR);
-diff --git a/mysql-test/t/cast.test b/mysql-test/t/cast.test
-index 1a1f512fca7..a74d79ad91f 100644
---- a/mysql-test/t/cast.test
-+++ b/mysql-test/t/cast.test
-@@ -799,6 +799,7 @@ SELECT CAST("extra" AS YEAR);
- SELECT CAST("22extra" AS YEAR);
- SELECT CAST("2020extra" AS YEAR);
-
-+SET timestamp = UNIX_TIMESTAMP('2020-12-22 03:30:00');
- #date[time] values
- SELECT CAST(TIMESTAMP'2010-01-01 00:00' AS YEAR);
- SET SQL_MODE = "";
-@@ -807,6 +808,7 @@ SET SQL_MODE = default;
- SELECT CAST(TIMESTAMP'2010-01-01 08:09:10' AS YEAR);
- SELECT CAST(TIME'08:09:10' AS YEAR);
- SELECT CAST(TIME'00:00:00' AS YEAR);
-+SET timestamp = DEFAULT;
-
- #geometry values
- --error ER_WRONG_ARGUMENTS

mysql.spec

@@ -29,7 +29,7 @@
 %bcond_without conflicts
 %global sameevr   %{?epoch:%{epoch}:}%{version}-%{release}
 Name:                mysql
-Version:             8.0.23
+Version:             8.0.24
 Release:             1
 Summary:             MySQL client programs and shared libraries
 URL:                 http://www.mysql.com
@@ -48,9 +48,6 @@ Source17:            mysql-wait-stop.sh
 Source18:            mysql@.service.in
 Source30:            %{pkgnamepatch}.rpmlintrc
 Source31:            server.cnf.in
-Source32:            mysql-boost-%{version}.tar.gz.aa
-Source33:            mysql-boost-%{version}.tar.gz.ab
-Source34:            mysql-boost-%{version}.tar.gz.ac
 Patch1:              %{pkgnamepatch}-install-test.patch
 Patch2:              %{pkgnamepatch}-s390-tsc.patch
 Patch3:              %{pkgnamepatch}-file-contents.patch
@@ -60,8 +57,6 @@ Patch51:             %{pkgnamepatch}-chain-certs.patch
 Patch52:             %{pkgnamepatch}-sharedir.patch
 Patch55:             %{pkgnamepatch}-rpath.patch
 Patch75:             %{pkgnamepatch}-arm32-timer.patch
-Patch78:	     %{pkgnamepatch}-gcc11.patch
-Patch79:             %{pkgnamepatch}-main-cast.patch
 Patch80:             %{pkgnamepatch}-fix-includes-robin-hood.patch
 Patch81:             disable-moutline-atomics-for-aarch64.patch
 Patch115:            boost-1.58.0-pool.patch
@@ -214,9 +209,6 @@ The package provides Docs for development of MySQL applications.
 
 
 %prep
-cd ../SOURCES
-cat %{SOURCE32} %{SOURCE33} %{SOURCE34} | tar xj
-cd ..
 %setup -q -n mysql-%{version}
 %patch1 -p1
 %patch2 -p1
@@ -227,8 +219,6 @@ cd ..
 %patch52 -p1
 %patch55 -p1
 %patch75 -p1
-%patch78 -p1
-%patch79 -p1
 %patch80 -p1
 %patch81 -p1
 pushd boost/boost_$(echo %{boost_bundled_version}| tr . _)
@@ -500,6 +490,7 @@ fi
 %{_bindir}/{ibd2sdi,myisamchk,myisam_ftdump,myisamlog,myisampack,my_print_defaults}
 %{_bindir}/{mysql_secure_installation,mysql_ssl_rsa_setup,mysql_tzinfo_to_sql,perror}
 %{_bindir}/{mysql_upgrade,mysqld_pre_systemd,mysqldumpslow,innochecksum}
+%{_bindir}/{mysql_keyring_encryption_test,mysql_migrate_keyring}
 %config(noreplace) %{_sysconfdir}/my.cnf.d/mysql-server.cnf
 %{_sbindir}/mysqld
 %caps(cap_sys_nice=ep) %{_libexecdir}/mysqld
@@ -509,9 +500,6 @@ fi
 %{_datadir}/mysql/*.sql
 %{_unitdir}/mysqld*
 %{_libexecdir}/{mysql-prepare-db-dir,mysql-wait-stop,mysql-check-socket,mysql-scripts-common}
-%exclude %{_tmpfilesdir}/mysql.conf
-%exclude %{_libdir}/mysql/*.a
-%exclude %{_datadir}/mysql/{mysql.server,mysqld_multi.server}
 %{_tmpfilesdir}/mysqld.conf
 %attr(0755,mysql,mysql) %dir %{_localstatedir}/lib/mysql
 %attr(0750,mysql,mysql) %dir %{_localstatedir}/lib/mysql-files
@@ -546,9 +534,18 @@ fi
 %{_mandir}/man1/{lz4_decompress.1*,zlib_decompress.1*,innochecksum.1*,mysql.server.1*}
 %{_mandir}/man8/mysqld.8*
 %{_mandir}/man1/mysql_config.1*
-%exclude %{_mandir}/man1/{mysqld_multi.1*,mysqld_safe.1*,comp_err.1*}
 
 %changelog
+* Thu May 8 2021 wutao <wutao61@huawei.com> - 8.0.24-1
+- Upgrade mysql to 8.0.24, fix CVES: CVE-2021-2166 CVE-2021-2146
+  CVE-2021-2162 CVE-2021-2212 CVE-2021-2299 CVE-2021-2293 CVE-2021-2215
+  CVE-2021-2278 CVE-2021-2164 CVE-2021-2208 CVE-2021-2217 CVE-2021-2203
+  CVE-2021-2226 CVE-2021-2298 CVE-2021-2230 CVE-2021-2300 CVE-2021-2304
+  CVE-2021-2172 CVE-2021-2194 CVE-2021-2170 CVE-2021-2196 CVE-2021-2201
+  CVE-2021-2180 CVE-2021-2307 CVE-2021-2169 CVE-2021-2171 CVE-2021-2305
+  CVE-2021-2179 CVE-2021-2174 CVE-2021-2193 CVE-2021-2232 CVE-2021-2301
+  CVE-2021-2308
+
 * Wed Mar 10 2021 wangxiao <wangxiao65@huawei.com> - 8.0.23-1
 - Upgrade mysql to 8.0.23, fix CVES: CVE-2021-1998 CVE-2021-2002
   CVE-2021-2010 CVE-2021-2011 CVE-2021-2016 CVE-2021-2021 CVE-2021-2022