packages/mysql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix internal compiler error: Segmentation fault

Browse Source
This commit is contained in:
maminjie 2020-09-19 09:10:37 +08:00
parent f5140e5160
commit 64284198f6
2 changed files with 55 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
0001-fix-internal-compiler-error-Segmentation-fault.patch Normal file
View File

@ -0,0 +1,49 @@
From 216086b1de9daef9cf74194354e0504b44b0519d Mon Sep 17 00:00:00 2001
From: maminjie <maminjie1@huawei.com>
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

8
mysql.spec
View File

@ -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 <maminjie1@huawei.com> - 8.0.21-2
* fix internal compiler error: Segmentation fault
* Mon Sep 14 2020 maminjie <maminjie1@huawei.com> - 8.0.21-1
- upgrade to 8.0.21
* Mon Jun 1 2020 Jeffery.Gao <gaojianxing@huawei.com> - 8.0.18-2
- Package upgrade.
* Wed Mar 1 2020 zhangtao<zhangtao221@huawei.com> 8.0.17-3
* Sun Mar 1 2020 zhangtao<zhangtao221@huawei.com> 8.0.17-3
- add fstack-protector-strong
* Fri Feb 28 2020 catastrowings <jianghuhao1994@163.com> 8.0.17-2