Rebase to 10.5.18

Fedora commit: 9f12d914a4

Resolves: RHEL-8419 RHEL-5466

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.16
+%global last_tested_version 10.5.18
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0
 
@@ -147,8 +147,8 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          10.5.16
-Release:          2%{?with_debug:.debug}%{?dist}
+Version:          10.5.18
+Release:          1%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
 Summary:          A very fast and robust SQL database server
@@ -731,7 +731,12 @@ rm -r storage/rocksdb/
 %patch4 -p1
 %patch7 -p1
 %patch9 -p1
-%patch10 -p1
+# The test in Patch 10 has been recently updated by upstream
+# and the test was disabled in the testuite run
+#   main.ssl_cipher     [ disabled ]  MDEV-17184 - Failures with OpenSSL 1.1.1
+# Keeping the patch commented out, need to revisit
+#  once the test is re-enabled by upstream  in some future release
+#%%patch10 -p1
 %patch16 -p1
 %patch17 -R -p1
 
@@ -1623,6 +1628,10 @@ fi
 %endif
 
 %changelog
+* Wed Nov 16 2022 Michal Schorm <mschorm@redhat.com> - 3:10.5.18-1
+- Rebase to 10.5.18
+- OpenSSL 3 patch upstreamed
+
 * Mon Jun 13 2022 Michal Schorm <mschorm@redhat.com> - 3:10.5.16-2
 - Release bump for rebuild
 

rh-skipped-tests-base.list

@@ -62,3 +62,8 @@ rpl.rpl_innodb_mixed_dml                     :
 # Since 10.5.10
 sys_vars.tcp_nodelay                         :
 innodb.restart                               :
+
+# Fails on all architectures since 10.5.18
+main.information_schema                      :
+main.loadxml                                 :
+main.lock_kill                               :

sources

@@ -1 +1 @@
-SHA512 (mariadb-10.5.16-downstream_modified.tar.gz) = c61457dcf4c2217b4432bee15094713e672f273a85f2f7a84326b619a0c51dd6f025d7bb94f5da35a2f4ac026c2b6fd32bd605985a5888101a06d62da8fdb02e
+SHA512 (mariadb-10.5.18-downstream_modified.tar.gz) = 9a99d766fb05fec8d80f3c38d3ec2cbf8e5d456fe230b534aac3ebbf39e1743448c111a2fddf6592b456835f0d07baa0db7bf1821d567de2f615f0f0f01131d3