parent
d8a18c3d89
commit
3444dbd746
23
mariadb-wsrep.patch
Normal file
23
mariadb-wsrep.patch
Normal file
@ -0,0 +1,23 @@
|
||||
From ca26b981274e8f32e7fad85597a1534285c79f26 Mon Sep 17 00:00:00 2001
|
||||
From: Damien Ciabrini <damien.ciabrini@gmail.com>
|
||||
Date: Fri, 12 Aug 2016 10:57:58 +0200
|
||||
Subject: [PATCH] refs codership/mysql-wsrep#267 Fix Galera crash at startup
|
||||
when compiled with gcc 6
|
||||
|
||||
---
|
||||
sql/wsrep_mysqld.cc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
|
||||
index 90567b6..b1024b6 100644
|
||||
--- a/sql/wsrep_mysqld.cc
|
||||
+++ b/sql/wsrep_mysqld.cc
|
||||
@@ -169,7 +169,7 @@ static PSI_file_info wsrep_files[]=
|
||||
|
||||
my_bool wsrep_inited = 0; // initialized ?
|
||||
|
||||
-static const wsrep_uuid_t cluster_uuid = WSREP_UUID_UNDEFINED;
|
||||
+static wsrep_uuid_t cluster_uuid = WSREP_UUID_UNDEFINED;
|
||||
static char cluster_uuid_str[40]= { 0, };
|
||||
static const char* cluster_status_str[WSREP_VIEW_MAX] =
|
||||
{
|
@ -123,7 +123,7 @@
|
||||
|
||||
Name: mariadb
|
||||
Version: %{compatver}.%{bugfixver}
|
||||
Release: 1%{?with_debug:.debug}%{?dist}
|
||||
Release: 2%{?with_debug:.debug}%{?dist}
|
||||
Epoch: 3
|
||||
|
||||
Summary: A community developed branch of MySQL
|
||||
@ -179,6 +179,7 @@ Patch37: %{pkgnamepatch}-notestdb.patch
|
||||
# Patches for galera
|
||||
Patch40: %{pkgnamepatch}-galera.cnf.patch
|
||||
Patch41: %{pkgnamepatch}-galera-new-cluster-help.patch
|
||||
Patch42: %{pkgnamepatch}-wsrep.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: libaio-devel
|
||||
@ -566,6 +567,7 @@ MariaDB is a community developed branch of MySQL.
|
||||
%patch37 -p1
|
||||
%patch40 -p1
|
||||
%patch41 -p1
|
||||
%patch42 -p1
|
||||
|
||||
sed -i -e 's/2.8.7/2.6.4/g' cmake/cpack_rpm.cmake
|
||||
|
||||
@ -1299,6 +1301,10 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Aug 29 2016 Jakub Dorňák <jdornak@redhat.com> - 3:10.1.16-2
|
||||
- Fixed galera replication
|
||||
Resolves: #1352946
|
||||
|
||||
* Tue Jul 19 2016 Jakub Dorňák <jdornak@redhat.com> - 3:10.1.16-1
|
||||
- Update to 10.1.16
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user