From d1343aa77b7c215b0b93ea3394854ea321fd8e77 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 25 2021 04:51:30 +0000
Subject: import mariadb-10.5.9-1.module+el8.4.0+10457+88cd7ba1


---

diff --git a/.gitignore b/.gitignore
index b43c6a5..023cbee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/mariadb-10.5.8.tar.gz
+SOURCES/mariadb-10.5.9.tar.gz
diff --git a/.mariadb.metadata b/.mariadb.metadata
index ab6f23b..032702d 100644
--- a/.mariadb.metadata
+++ b/.mariadb.metadata
@@ -1 +1 @@
-6442a3c9d9d316086ce6822f18e2e026bd8422d0 SOURCES/mariadb-10.5.8.tar.gz
+73767fac3d1c504298259708272fb6a58e644967 SOURCES/mariadb-10.5.9.tar.gz
diff --git a/SOURCES/rh-skipped-tests-s390.list b/SOURCES/rh-skipped-tests-s390.list
index 3ca7588..b7f91d6 100644
--- a/SOURCES/rh-skipped-tests-s390.list
+++ b/SOURCES/rh-skipped-tests-s390.list
@@ -1,3 +1,5 @@
 # Fails since 10.5.2
 perfschema.memory_aggregate_32bit :
 period.overlaps :
+# Fails since 10.5.9
+bugfix.wait_timeout :
diff --git a/SPECS/mariadb.spec b/SPECS/mariadb.spec
index 2c66727..09fea8f 100644
--- a/SPECS/mariadb.spec
+++ b/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.8
+%global last_tested_version 10.5.9
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0
 
@@ -116,7 +116,7 @@
 %bcond_without unbundled_pcre
 %else
 %bcond_with unbundled_pcre
-%global pcre_bundled_version 10.34
+%global pcre_bundled_version 10.36
 %endif
 
 # Use main python interpretter version
@@ -154,8 +154,8 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          10.5.8
-Release:          4%{?with_debug:.debug}%{?dist}
+Version:          10.5.9
+Release:          1%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
 Summary:          A very fast and robust SQL database server
@@ -911,7 +911,7 @@ export CFLAGS CXXFLAGS CPPFLAGS
 # Print all Cmake options values; "-LAH" means "List Advanced Help"
 cmake -B %{_vpath_builddir} -LAH
 
-%cmake_build
+%cmake_build -j2
 
 # build selinux policy
 %if %{with galera}
@@ -1253,7 +1253,7 @@ 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 \
+    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 \
     %if %{ignore_testsuite_result}
       --max-test-fail=999 || :
     %endif
@@ -1661,6 +1661,9 @@ fi
 %endif
 
 %changelog
+* Mon Mar 22 2021 Michal Schorm <mschorm@redhat.com> - 10.5.9-1
+- Rebase to 10.5.9
+
 * Fri Mar 19 2021 Michal Schorm <mschorm@redhat.com> - 10.5.8-4
 - Move the PAM plugin to a standalone sub-package