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 9ba6934bbb879085bd35dc600a02adacdabafccc..93f4263f8ab7b4322a37668045cfc60b710d689f 100644 --- a/mysql.spec +++ b/mysql.spec @@ -30,7 +30,7 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: mysql Version: 8.0.22 -Release: 1 +Release: 2 Summary: MySQL client programs and shared libraries URL: http://www.mysql.com License: GPLv2 with exceptions and LGPLv2 and BSD @@ -66,9 +66,7 @@ BuildRequires: lz4-devel mecab-devel bison libzstd-devel BuildRequires: numactl-devel %endif BuildRequires: openssl openssl-devel -%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: perl-interpreter perl-generators -%endif BuildRequires: rpcgen libtirpc-devel BuildRequires: protobuf-lite-devel rapidjson-devel zlib zlib-devel multilib-rpm-config procps BuildRequires: time perl(base) perl(Carp) perl(Cwd) perl(Digest::file) perl(Digest::MD5) @@ -539,6 +537,9 @@ fi %exclude %{_mandir}/man1/{mysqld_multi.1*,mysqld_safe.1*,comp_err.1*} %changelog +* Wed Jan 13 2021 Shengjing Wei - 8.0.22-2 +- Delete useless information + * Tue Dec 1 2020 weishengjing - 8.0.22-1 - New version 8.0.22 fix CVES: CVE-2020-14852 CVE-2020-14794 CVE-2020-14775 CVE-2020-14893 CVE-2020-14829 CVE-2020-14828 CVE-2020-14888 CVE-2020-14891