diff --git a/community-mysql-arm32-timer.patch b/community-mysql-arm32-timer.patch index 5bc7f67..bbfc560 100644 --- a/community-mysql-arm32-timer.patch +++ b/community-mysql-arm32-timer.patch @@ -1,8 +1,8 @@ ---- 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!"), - ("Invalid systemd notify socket, cannot send: "), +--- mysql-8.0.24/mysql-test/include/mtr_warnings.sql.orig 2021-04-18 18:04:05.166312799 +0200 ++++ mysql-8.0.24/mysql-test/include/mtr_warnings.sql 2021-04-18 18:04:23.605495467 +0200 +@@ -308,6 +308,11 @@ + */ + ("Manifest file '.*' is not read-only. For better security, please make sure that the file is read-only."), + /* + ARM32 don't support timers and get this warning in every test. diff --git a/community-mysql-gcc11.patch b/community-mysql-gcc11.patch deleted file mode 100644 index 8a030a8..0000000 --- a/community-mysql-gcc11.patch +++ /dev/null @@ -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 - #include -+#include - - #include - -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 -+#include - - #include "my_dbug.h" - #include "my_macros.h" diff --git a/community-mysql-main-cast.patch b/community-mysql-main-cast.patch deleted file mode 100644 index c078fae..0000000 --- a/community-mysql-main-cast.patch +++ /dev/null @@ -1,48 +0,0 @@ -commit 68730acd9ae7ae8b2fcd25b5ccd18d47038d00b9 -Author: Catalin Besleaga -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 diff --git a/community-mysql.spec b/community-mysql.spec index aad8d51..cf51fb6 100644 --- a/community-mysql.spec +++ b/community-mysql.spec @@ -72,8 +72,8 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: community-mysql -Version: 8.0.23 -Release: 3%{?with_debug:.debug}%{?dist} +Version: 8.0.24 +Release: 1%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com @@ -111,8 +111,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 # Patches taken from boost 1.59 @@ -379,8 +377,6 @@ the MySQL sources. %patch52 -p1 %patch55 -p1 %patch75 -p1 -%patch78 -p1 -%patch79 -p1 %patch80 -p1 # Patch Boost @@ -609,7 +605,7 @@ echo "%{_libdir}/mysql" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arc # and just create a symlink in /usr/sbin mv %{buildroot}%{_bindir}/mysqld %{buildroot}%{_libexecdir}/mysqld mkdir -p %{buildroot}%{_sbindir} -ln -s %{_libexecdir}/mysqld %{buildroot}%{_sbindir}/mysqld +ln -s ../libexec/mysqld %{buildroot}%{_sbindir}/mysqld %if %{with debug} mv %{buildroot}%{_bindir}/mysqld-debug %{buildroot}%{_libexecdir}/mysqld @@ -797,6 +793,7 @@ fi %{_bindir}/myisamlog %{_bindir}/myisampack %{_bindir}/my_print_defaults +%{_bindir}/mysql_migrate_keyring %{_bindir}/mysql_secure_installation %{_bindir}/mysql_ssl_rsa_setup %{_bindir}/mysql_tzinfo_to_sql @@ -822,6 +819,7 @@ fi %{_libdir}/mysql/plugin/adt_null.so %{_libdir}/mysql/plugin/auth_socket.so %{_libdir}/mysql/plugin/component_audit_api_message_emit.so +%{_libdir}/mysql/plugin/component_keyring_file.so %{_libdir}/mysql/plugin/component_log_filter_dragnet.so %{_libdir}/mysql/plugin/component_log_sink_json.so %{_libdir}/mysql/plugin/component_log_sink_syseventlog.so @@ -902,6 +900,7 @@ fi %if %{with test} %files test %{_bindir}/mysql_client_test +%{_bindir}/mysql_keyring_encryption_test %{_bindir}/mysqltest %{_bindir}/mysqltest_safe_process %{_bindir}/mysqlxtest @@ -992,6 +991,9 @@ fi %endif %changelog +* Sun Apr 18 2021 Lars Tangvald - 8.0.24-1 +- Update to MySQL 8.0.24 + * Wed Mar 31 2021 Jonathan Wakely - 8.0.23-3 - Rebuilt for removed libstdc++ symbols (#1937698) diff --git a/sources b/sources index 46508e6..93fc836 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-boost-8.0.23.tar.gz) = b8c2e2ac772b7b730f8b3bac7a5afb205da173b3639500606e7d1fac74832a0134027951855a2dc81af015e6158c924927ad63b9e1f2e7c823d45d4c4961c3f8 +SHA512 (mysql-boost-8.0.24.tar.gz) = ad8510614251c056f0963f8e51b9ed5e75452ccbf2728254d662fcc3a7ee1bdc177d1d34e958ddc31c7e6b5b3af9377ef2d9cbdc0353676b3026619673447deb