From ec145c0baee04bbfd1d6e0921436648aeb7493e3 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 5 Nov 2020 07:51:54 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/mariadb.git#37f1f439cfc3ef62f6f876be7149be7643ade1e0 --- mariadb.spec | 26 ++++++++++++++++++++++---- rh-skipped-tests-arm.list | 3 +++ rh-skipped-tests-base.list | 3 +++ sources | 2 +- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index 8edf116..653ccf4 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -151,8 +151,8 @@ %global sameevr %{epoch}:%{version}-%{release} Name: mariadb -Version: 10.4.14 -Release: 3%{?with_debug:.debug}%{?dist} +Version: 10.4.16 +Release: 1%{?with_debug:.debug}%{?dist} Epoch: 3 Summary: A very fast and robust SQL database server @@ -177,10 +177,25 @@ Source50: rh-skipped-tests-base.list Source51: rh-skipped-tests-arm.list Source52: rh-skipped-tests-s390.list Source53: rh-skipped-tests-ppc.list -# Proposed upstream: https://jira.mariadb.org/browse/MDEV-12442 -# General upstream response was slightly positive +# Red Hat OpenStack scripts: +# Clustercheck: +# Maintainer: +# Damien Ciabrini +# Source / Upstream: +# Damien; based on https://github.com/olafz/percona-clustercheck +# not updated in 5 years; low-effort maintenance +# Purpose: +# In Openstack, galera is accessed like an A/P database, we have a +# load balancer (haproxy) that drives traffic to a single node and +# performs failover when the galera node monitor fails. +# clustercheck.sh is the monitoring script that is being called remotely +# by haproxy. It is a glue between haproxy and the local galera node that +# can run SQL commands to check whether the local galera is connected to the galera cluster. +# Proposed to MariaDB upstream: https://jira.mariadb.org/browse/MDEV-12442 +# General upstream response was slightly positive Source70: clustercheck.sh Source71: LICENSE.clustercheck + # Upstream said: "Generally MariaDB has more allows to allow for xtradb sst mechanism". # https://jira.mariadb.org/browse/MDEV-12646 Source72: mariadb-server-galera.te @@ -1580,6 +1595,9 @@ fi %endif %changelog +* Wed Nov 04 2020 Michal Schorm - 10.4.16-1 +- Rebase to 10.4.16 + * Sun Sep 06 2020 Michal Schorm - 10.4.14-3 - Resolves: #1851605 diff --git a/rh-skipped-tests-arm.list b/rh-skipped-tests-arm.list index ec37d1b..ec2e920 100644 --- a/rh-skipped-tests-arm.list +++ b/rh-skipped-tests-arm.list @@ -1,2 +1,5 @@ # Fails since 10.3.17, only on armv7hl versioning.partition : + +# Fail since 10.4.16 only on armv7hl +versioning.partition_rotation : diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list index 44b5c9d..9767f9e 100644 --- a/rh-skipped-tests-base.list +++ b/rh-skipped-tests-base.list @@ -41,3 +41,6 @@ encryption.innodb-redo-badkey : # Fails on all architectures since 10.4.14 main.ssl_system_ca : disks.disks : + +# Since 10.3.26 produces a warning to the test logfile which causes the test to fail +plugins.feedback_plugin_load : diff --git a/sources b/sources index adb63eb..6176707 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mariadb-10.4.14.tar.gz) = c09817c1dd7962132bcf2886c97ad17ce43c00ee687724028e5f39f6a6a93877ae8695c2c795abba6a4f3bc40674f93a53d6d43f46788a4a8a42c4a65a22c91c +SHA512 (mariadb-10.4.16.tar.gz) = 4442e082f8ca61972336907cc4ca4d0a6ce48db2f78d038a51970789618a7ef0f456f158ec41b1ede2f7e32df1c411c7ebcfaa16aa9ee5dc77df6f453b1d2095