import CS mariadb-10.5.22-1.scrmod+el8+676+44dadec7

.gitignore

@@ -1 +1 @@
-SOURCES/mariadb-10.5.16-downstream_modified.tar.gz
+SOURCES/mariadb-10.5.22-downstream_modified.tar.gz

.mariadb.metadata

@@ -1 +1 @@
-10c51d806a5eba0abce079a1965a487ff104a9a1 SOURCES/mariadb-10.5.16-downstream_modified.tar.gz
+d767fc64fbf44da4e1a4174a9939356fac5fe19b SOURCES/mariadb-10.5.22-downstream_modified.tar.gz

SOURCES/rh-skipped-tests-base.list

@@ -62,3 +62,30 @@ 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                               :
+
+# Fails since 10.5.20
+innodb.innodb_bug51920                      :
+innodb.row_size_error_log_warnings_3        :
+binlog_encryption.rpl_cant_read_event_incident :
+bg.spider_fixes                             :
+bugfix.mdev_29904                          : "[Warning] mariadbd: Can't get hardware address with error 0"
+sys_vars.completion_type_func               :
+rpl.rpl_report_port                         :
+rpl.rpl_reset_slave_fail                    :
+rpl.rpl_xa_survive_disconnect_lsu_off       :
+rpl.rpl_heartbeat_basic                     :
+rpl.rpl_xa_survive_disconnect               :
+rpl.rpl_err_ignoredtable                    :
+rpl.rpl_row_img_sequence_full               :
+rpl.rpl_row_img_sequence_min                :
+rpl.rpl_row_img_sequence_noblob             :
+rpl.rpl_xa_empty_transaction                :
+rpl.rpl_slave_shutdown_mdev20821            :
+
+# Fails since 10.5.22
+mariabackup.aria_log_dir_path               :

SOURCES/rh-skipped-tests-ppc.list

@@ -9,3 +9,14 @@ innodb.innodb_defrag_concurrent :
 rpl.rpl_parallel_xa_same_xid : 
 parts.part_supported_sql_func_innodb : 
 parts.partition_alter2_1_1_innodb : 
+
+# Fails since 10.5.20
+innodb.innodb_defrag_concurrent        :
+parts.partition_alter4_innodb          :
+rpl.rpl_parallel_optimistic_xa_lsu_off :
+
+# Fails since 10.5.22
+parts.partition_alter2_1_2_innodb      :
+innodb_gis.kill_server                 :
+parts.partition_alter2_2_1_innodb      :
+parts.partition_alter2_2_2_innodb      :

SPECS/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.21
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0
 
@@ -109,7 +109,7 @@
 %bcond_without unbundled_pcre
 %else
 %bcond_with unbundled_pcre
-%global pcre_bundled_version 10.40
+%global pcre_bundled_version 10.42
 %endif
 
 # Use main python interpretter version
@@ -147,8 +147,8 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          10.5.16
+Version:          10.5.22
-Release:          2%{?with_debug:.debug}%{?dist}
+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
 
@@ -762,7 +767,7 @@ sed 's/mariadb-server-galera/%{name}-server-galera/' %{SOURCE72} > selinux/%{nam
 
 
 # Get version of PCRE, that upstream use
-pcre_version=`grep -e "https://github.com/PhilipHazel/pcre2/releases/download" cmake/pcre.cmake | sed -r "s;.*pcre2-([[:digit:]]+\.[[:digit:]]+).*;\1;" `
+pcre_version=`grep -e "https://github.com/PCRE2Project/pcre2/releases/download" cmake/pcre.cmake | sed -r "s;.*pcre2-([[:digit:]]+\.[[:digit:]]+).*;\1;" `
 
 # Check if the PCRE version in macro 'pcre_bundled_version', used in Provides: bundled(...), is the same version as upstream actually bundles
 %if %{without unbundled_pcre}
@@ -867,10 +872,10 @@ CFLAGS="$CFLAGS -fPIC"
 %if %{with debug}
 # Override all optimization flags when making a debug build
 # -D_FORTIFY_SOURCE requires optimizations enabled. Disable the fortify.
-CFLAGS=`echo "$CFLAGS" | sed -r 's/-D_FORTIFY_SOURCE=[012]/-D_FORTIFY_SOURCE=0/'`
+%undefine _fortify_level
 CFLAGS=`echo "$CFLAGS" | sed -r 's/-O[0123]//'`
 
-CFLAGS="$CFLAGS -O0 -g -D_FORTIFY_SOURCE=0"
+CFLAGS="$CFLAGS -O0 -g"
 
 # Fixes for Fedora 32 & Rawhide (GCC 10.0):
 %if 0%{?fedora} >= 32
@@ -1226,9 +1231,11 @@ export MTR_BUILD_THREAD=$(( $(date +%s) % 1100 ))
       --skip-test-list=unstable-tests
     %endif
     # Second run for the SPIDER suites that fail with SCA (ssl self signed certificate)
-    perl ./mysql-test-run.pl $common_testsuite_arguments --skip-ssl --big-test --mem --suite=spider,spider/bg,spider/bugfix,spider/handler --skip-test-list=unstable-tests \
+    perl ./mysql-test-run.pl $common_testsuite_arguments --skip-ssl --big-test --suite=spider,spider/bg,spider/bugfix,spider/handler --skip-test-list=unstable-tests \
     %if %{ignore_testsuite_result}
       --max-test-fail=999 || :
+    %else
+      --skip-test-list=unstable-tests
     %endif
   # blank line
   fi
@@ -1623,6 +1630,22 @@ fi
 %endif
 
 %changelog
+* Mon Sep 04 2023 Michal Schorm <mschorm@redhat.com> - 3:10.5.22-1
+- Rebase to 10.5.22
+
+* Wed Jul 26 2023 Michal Schorm <mschorm@redhat.com> - 3:10.5.21-1
+- Rebase to version 10.5.21
+
+* Wed May 31 2023 Siddhesh Poyarekar <siddhesh@redhat.com> - 3:10.5.20-2
+- Use _fortify_level to disable fortification in debug builds
+
+* Tue May 30 2023 Lukas Javorsky <ljavorsk@redhat.com> - 3:10.5.20-1
+- Rebase to version 10.5.20
+
+* 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