Rebase to 8.0.23

Created mysql-fix-includes-robin-hood.patch
and mysql-main-cast.patch

Related: #1969430
This commit is contained in:
Lars Tangvald 2021-09-14 14:29:54 +02:00 committed by Michal Schorm
parent be8aafb77a
commit 6fd09810c5
4 changed files with 81 additions and 3 deletions

View File

@ -0,0 +1,13 @@
# Prevents fails when compiling with gcc11 (Fedora 34)
# Upstream PR: https://github.com/mysql/mysql-server/pull/323
--- mysql-8.0.23/extra/robin-hood-hashing/robin_hood.h.old 2021-02-04 17:15:31.034997221 +0100
+++ mysql-8.0.23/extra/robin-hood-hashing/robin_hood.h 2021-02-04 17:15:50.781372066 +0100
@@ -48,6 +48,7 @@
#include <string>
#include <type_traits>
#include <utility>
+#include <limits>
#if __cplusplus >= 201703L
# include <string_view>
#endif

48
mysql-main-cast.patch Normal file
View File

@ -0,0 +1,48 @@
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

View File

@ -72,8 +72,8 @@
%global sameevr %{?epoch:%{epoch}:}%{version}-%{release}
Name: mysql
Version: 8.0.22
Release: 7%{?with_debug:.debug}%{?dist}
Version: 8.0.23
Release: 1%{?with_debug:.debug}%{?dist}
Summary: MySQL client programs and shared libraries
URL: http://www.mysql.com
@ -113,6 +113,8 @@ Patch55: %{pkgnamepatch}-rpath.patch
Patch75: %{pkgnamepatch}-arm32-timer.patch
Patch78: %{pkgnamepatch}-gcc11.patch
Patch79: %{pkgnamepatch}-openssl3.patch
Patch80: %{pkgnamepatch}-fix-includes-robin-hood.patch
Patch81: %{pkgnamepatch}-main-cast.patch
# Patches taken from boost 1.59
Patch115: boost-1.58.0-pool.patch
@ -128,6 +130,7 @@ BuildRequires: lz4
BuildRequires: lz4-devel
BuildRequires: mecab-devel
BuildRequires: bison
BuildRequires: libcurl-devel
BuildRequires: libzstd-devel
%ifnarch aarch64 %{arm} s390 s390x
BuildRequires: numactl-devel
@ -382,6 +385,8 @@ the MySQL sources.
%patch75 -p1
%patch78 -p1
%patch79 -p1
%patch80 -p1
%patch81 -p1
# Patch Boost
pushd boost/boost_$(echo %{boost_bundled_version}| tr . _)
@ -494,6 +499,10 @@ add_test rpl.rpl_slave_start_after_clone failing for 8.0.22
add_test rpl.rpl_xa_survive_disconnect_table failing for 8.0.22
%endif
%ifarch ppc64le
add_test sys_vars.innodb_buffer_pool_size_basic
%endif
# mysql-test
popd
@ -848,6 +857,8 @@ fi
%{_libdir}/mysql/plugin/component_log_sink_json.so
%{_libdir}/mysql/plugin/component_log_sink_syseventlog.so
%{_libdir}/mysql/plugin/component_mysqlbackup.so
%{_libdir}/mysql/plugin/component_query_attributes.so
%{_libdir}/mysql/plugin/component_reference_cache.so
%{_libdir}/mysql/plugin/component_validate_password.so
%{_libdir}/mysql/plugin/connection_control.so
%{_libdir}/mysql/plugin/daemon_example.ini
@ -992,6 +1003,7 @@ fi
%{_libdir}/mysql/plugin/libtest_sql_replication.so
%{_libdir}/mysql/plugin/libtest_sql_reset_connection.so
%{_libdir}/mysql/plugin/libtest_sql_shutdown.so
%{_libdir}/mysql/plugin/libtest_sql_sleep_is_connected.so
%{_libdir}/mysql/plugin/libtest_sql_sqlmode.so
%{_libdir}/mysql/plugin/libtest_sql_stmt.so
%{_libdir}/mysql/plugin/libtest_sql_stored_procedures_functions.so
@ -1011,6 +1023,11 @@ fi
%endif
%changelog
* Tue Sep 14 2021 Lars Tangvald <lars.tangvald@oracle.com> - 8.0.23-1
- Update to MySQL 8.0.23
- Created mysql-fix-includes-robin-hood.patch
- Created mysql-main-cast.patch
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 8.0.22-7
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688

View File

@ -1 +1 @@
SHA512 (mysql-boost-8.0.22.tar.gz) = 792f2ada93ec67a4679228478c6b798e81d9e9f6d13c7f4977cb7682738a4aae3cb483294edc6b2fde16c3960e51af8786216c063ab500840afd39a609e4b612
SHA512 (mysql-boost-8.0.23.tar.gz) = b8c2e2ac772b7b730f8b3bac7a5afb205da173b3639500606e7d1fac74832a0134027951855a2dc81af015e6158c924927ad63b9e1f2e7c823d45d4c4961c3f8