diff --git a/0001-fix-internal-compiler-error-Segmentation-fault.patch b/0001-fix-internal-compiler-error-Segmentation-fault.patch new file mode 100644 index 0000000000000000000000000000000000000000..8b22d0b0db6daa25518c7ac4a9397abcb15549da --- /dev/null +++ b/0001-fix-internal-compiler-error-Segmentation-fault.patch @@ -0,0 +1,49 @@ +From 216086b1de9daef9cf74194354e0504b44b0519d Mon Sep 17 00:00:00 2001 +From: maminjie +Date: Thu, 10 Sep 2020 16:44:50 +0800 +Subject: [PATCH] fix internal compiler error: Segmentation fault + +--- + sql/dd/impl/types/partition_impl.cc | 6 +++++- + sql/dd/impl/types/partition_impl.h | 1 + + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/sql/dd/impl/types/partition_impl.cc b/sql/dd/impl/types/partition_impl.cc +index da8b057..fae0bac 100644 +--- a/sql/dd/impl/types/partition_impl.cc ++++ b/sql/dd/impl/types/partition_impl.cc +@@ -291,7 +291,7 @@ bool Partition_impl::deserialize(Sdi_rcontext *rctx, const RJ_Value &val) { + deserialize_each( + rctx, [this]() { return add_index(nullptr); }, val, "indexes"); + deserialize_each( +- rctx, [this]() { return add_subpartition(); }, val, "subpartitions"); ++ rctx, [this]() { return add_subpartition_impl(); }, val, "subpartitions"); + + return deserialize_tablespace_ref(rctx, &m_tablespace_id, val, + "tablespace_ref"); +@@ -371,6 +371,10 @@ Partition_index *Partition_impl::add_index(Index *idx) { + /////////////////////////////////////////////////////////////////////////// + + Partition *Partition_impl::add_subpartition() { ++ return add_subpartition_impl(); ++} ++ ++Partition_impl *Partition_impl::add_subpartition_impl() { + /// Support just one level of sub partitions. + DBUG_ASSERT(!parent()); + +diff --git a/sql/dd/impl/types/partition_impl.h b/sql/dd/impl/types/partition_impl.h +index 3b3068a..7a10649 100644 +--- a/sql/dd/impl/types/partition_impl.h ++++ b/sql/dd/impl/types/partition_impl.h +@@ -247,6 +247,7 @@ class Partition_impl : public Entity_object_impl, public Partition { + ///////////////////////////////////////////////////////////////////////// + + virtual Partition *add_subpartition(); ++ virtual Partition_impl *add_subpartition_impl(); + + virtual const Table::Partition_collection &subpartitions() const { + return m_subpartitions; +-- +2.23.0 + diff --git a/mysql.spec b/mysql.spec index 24f0c78cfdf64e8426ee3c28d353560f710d5d22..bb2385796604ee1418c70dba8d19f3226937a2e8 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,7 +1,7 @@ #%{!?runselftest:%global runselftest 0} Name: mysql Version: 8.0.21 -Release: 1 +Release: 2 Summary: The package provides MySQL programs and shared libraries License: GPLv2 with exceptions and LGPLv2 and BSD URL: http://www.mysql.com @@ -28,6 +28,7 @@ Patch0005: community-mysql-sharedir.patch Patch0006: community-mysql-rpath.patch Patch0007: boost-1.58.0-pool.patch Patch0008: boost-1.57.0-mpl-print.patch +Patch0009: 0001-fix-internal-compiler-error-Segmentation-fault.patch BuildRequires: cmake gcc-c++ libaio-devel libedit-devel libevent-devel libicu-devel BuildRequires: lz4-devel mecab-devel bison libzstd-devel openssl openssl-devel BuildRequires: perl-interpreter perl-generators rpcgen libtirpc-devel lz4 @@ -367,13 +368,16 @@ fi %exclude %{_mandir}/man1/{mysqld_multi.1*,mysqld_safe.1*,comp_err.1*} %changelog +* Sat Sep 19 2020 maminjie - 8.0.21-2 +* fix internal compiler error: Segmentation fault + * Mon Sep 14 2020 maminjie - 8.0.21-1 - upgrade to 8.0.21 * Mon Jun 1 2020 Jeffery.Gao - 8.0.18-2 - Package upgrade. -* Wed Mar 1 2020 zhangtao 8.0.17-3 +* Sun Mar 1 2020 zhangtao 8.0.17-3 - add fstack-protector-strong * Fri Feb 28 2020 catastrowings 8.0.17-2