From 51b8f2af1b0eb83a6ececf1cf31a5d4f8f32eeab Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Fri, 6 Nov 2020 02:34:10 +0100
Subject: [PATCH] Rebase to 10.5.7

---
 mariadb.spec               | 8 ++++++--
 rh-skipped-tests-base.list | 4 ++++
 sources                    | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/mariadb.spec b/mariadb.spec
index 722b855..1c21755 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -153,7 +153,7 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          10.5.5
+Version:          10.5.7
 Release:          1%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
@@ -1070,6 +1070,7 @@ rm %{buildroot}%{_libdir}/%{pkg_name}/plugin/auth_gssapi_client.so
 %if %{without clibrary} || %{without devel}
 rm %{buildroot}%{_bindir}/mysql_config*
 rm %{buildroot}%{_bindir}/mariadb_config
+rm %{buildroot}%{_bindir}/mariadb-config
 rm %{buildroot}%{_mandir}/man1/mysql_config*.1*
 %endif
 
@@ -1561,11 +1562,11 @@ fi
 %{_libdir}/{libmysqlclient.so.18,libmariadb.so,libmysqlclient.so,libmysqlclient_r.so}
 %{_bindir}/mysql_config*
 %{_bindir}/mariadb_config*
+%{_bindir}/mariadb-config
 %{_libdir}/libmariadb.so
 %{_libdir}/libmysqlclient.so
 %{_libdir}/libmysqlclient_r.so
 %{_mandir}/man1/mysql_config*
-%{_mandir}/man1/mariadb_config*
 %endif
 %endif
 
@@ -1597,6 +1598,9 @@ fi
 %endif
 
 %changelog
+* Fri Nov 06 2020 Michal Schorm <mschorm@redhat.com> - 10.5.7-1
+- Rebase to 10.5.7
+
 * Mon Sep 21 2020 Lukas Javorsky <ljavorsk@redhat.com> - 10.5.5-1
 - Rebase to 10.5.5
 - Fix mariadb-ownsetup
diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list
index aef2dc4..a0bb6a8 100644
--- a/rh-skipped-tests-base.list
+++ b/rh-skipped-tests-base.list
@@ -48,3 +48,7 @@ main.mysqld--help-aria                       :
 
 # Fails since 10.5.4
 main.ssl_system_ca                           :
+
+# Fails since 10.5.7
+innodb.innodb_wl6326_big                     :
+plugins.feedback_plugin_load                 :
diff --git a/sources b/sources
index c13bc61..0ff6148 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mariadb-10.5.5.tar.gz) = 09bed291b39142f8e2f40eabbb443f6f384368b331406a09fd92d3d27ecc75644219066850d89495ed65c6f0d3ac32d51e29e65375331dcc2de4801313178d45
+SHA512 (mariadb-10.5.7.tar.gz) = d964c61d6ba7cf21fea97b8e0b6a0bf1ee50fc7a7995753dafd710f4656001bd6e03c243896efb5802cce16dd6470849ed036d09b17415a538e008f64e974a9f