Rebase to 10.5.13

- Full testsuite checked
- Patch 16 upstreamed

mariadb.spec

@@ -15,7 +15,7 @@
 # The last version on which the full testsuite has been run
 # In case of further rebuilds of that version, don't require full testsuite to be run
 # run only "main" suite
-%global last_tested_version 10.5.12
+%global last_tested_version 10.5.13
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0
 
@@ -153,8 +153,8 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          10.5.12
-Release:          3%{?with_debug:.debug}%{?dist}
+Version:          10.5.13
+Release:          1%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
 Summary:          A very fast and robust SQL database server
@@ -221,8 +221,6 @@ Patch11:          %{pkgnamepatch}-pcdir.patch
 Patch12:           %{pkgnamepatch}-openssl3.patch
 #   Patch15:  Add option to edit groonga's and groonga-normalizer-mysql install path
 Patch15:          %{pkgnamepatch}-groonga.patch
-#   Patch16:  Fix port bug in mysql_setpermission perl script
-Patch16:          %{pkgnamepatch}-scripts-setpermission.patch
 
 BuildRequires:    make
 BuildRequires:    cmake gcc-c++
@@ -754,7 +752,6 @@ rm -r storage/rocksdb/
 %patch12 -p1
 %endif
 %patch15 -p1
-%patch16 -p1
 
 # generate a list of tests that fail, but are not disabled by upstream
 cat %{SOURCE50} | tee -a mysql-test/unstable-tests
@@ -1648,6 +1645,9 @@ fi
 %endif
 
 %changelog
+* Thu Dec 02 2021 Michal Schorm <mschorm@redhat.com> - 3:10.5.13-1
+- Rebase to 10.5.13
+
 * Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 3:10.5.12-3
 - Rebuilt with OpenSSL 3.0.0
 

rh-skipped-tests-base.list

@@ -52,3 +52,15 @@ main.ssl_system_ca                           :
 # Fails since 10.5.7
 innodb.innodb_wl6326_big                     :
 plugins.feedback_plugin_load                 :
+
+# Fails on all architectures since 10.5.13
+oqgraph.regression_mdev6345                  :
+type_test.type_test_double                   :
+# Fails on i686 since 10.5.13
+oqgraph.general-innodb                       :
+oqgraph.general-Aria                         :
+oqgraph.general-MyISAM                       :
+oqgraph.legacy_upgrade                       :
+oqgraph.regression_1133093                   :
+oqgraph.regression_1196036                   :
+oqgraph.regression_1213120                   :

sources

@@ -1 +1 @@
-SHA512 (mariadb-10.5.12-downstream_modified.tar.gz) = a57a6f838966cb7b149837c2f4d59c53dd0678ffa6fec4ff49cbbf15f008f0bd951c317cd0303358ebf94ea432af4d26e7ba8a849da5650aa706083bd96d0250
+SHA512 (mariadb-10.5.13-downstream_modified.tar.gz) = e8b8dce731d2dd3b3d1f5109cc811db8554d10f8269f11f40fcbf62fa0e0f0d1c18bc3b28b8017c28dcfcee96024b18e5489f50cc270a93e4bedd9ea49db08c6