From 39e1cf5a6f0043392ff50eee1bf68e4b75d23747 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 26 Apr 2022 09:52:37 -0400 Subject: [PATCH] import mariadb-10.3.32-2.module+el8.5.0+14124+14ced695 --- .gitignore | 2 +- .mariadb.metadata | 2 +- SOURCES/mariadb-logrotate.patch | 13 +++++++++---- SPECS/mariadb.spec | 31 ++++++++++++++++++++++++------- 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index a0ad606..47349ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mariadb-10.3.28.tar.gz +SOURCES/mariadb-10.3.32.tar.gz diff --git a/.mariadb.metadata b/.mariadb.metadata index 813d9bf..0a968da 100644 --- a/.mariadb.metadata +++ b/.mariadb.metadata @@ -1 +1 @@ -eaf7fbf7878103601f3bbecbdbfc25ffb39e65f1 SOURCES/mariadb-10.3.28.tar.gz +ad2b6d16fcbcdc3e0a131e75efe72ec695054be3 SOURCES/mariadb-10.3.32.tar.gz diff --git a/SOURCES/mariadb-logrotate.patch b/SOURCES/mariadb-logrotate.patch index 6af9466..14ef932 100644 --- a/SOURCES/mariadb-logrotate.patch +++ b/SOURCES/mariadb-logrotate.patch @@ -26,9 +26,13 @@ Update 6/2018 beeing able to send the SIGHUP to the process and read the mysqld pid file, which root can. * Submited as PR: https://github.com/MariaDB/server/pull/807 ---- mariadb-10.3.19/support-files/mysql-log-rotate.sh 2019-11-03 17:03:27.000000000 +0100 -+++ mariadb-10.3.19/support-files/mysql-log-rotate.sh_patched 2019-11-06 15:07:54.205379672 +0100 -@@ -3,23 +3,10 @@ +Update 01/2022 +* added delaycompress option +* see https://mariadb.com/kb/en/rotating-logs-on-unix-and-linux + +--- mariadb-10.3.32/support-files/mysql-log-rotate.sh 2022-01-14 17:03:27.000000000 +0100 ++++ mariadb-10.3.32/support-files/mysql-log-rotate.sh_patched 2022-01-17 15:07:54.205379672 +0100 +@@ -3,35 +3,21 @@ # in the [mysqld] section as follows: # # [mysqld] @@ -55,8 +59,9 @@ Update 6/2018 notifempty daily rotate 3 -@@ -27,11 +14,9 @@ + missingok compress ++ delaycompress postrotate # just if mysqld is really running - if test -x @bindir@/mysqladmin && \ diff --git a/SPECS/mariadb.spec b/SPECS/mariadb.spec index 0543ee0..6b49253 100644 --- a/SPECS/mariadb.spec +++ b/SPECS/mariadb.spec @@ -33,7 +33,7 @@ # Experimental version of the Cassandra storage engine # The tests needs running cassandra server # Do not build it for now -%if %_arch == x86_64 && 0%{?fedora} +%if "%_arch" == "x86_64" && 0%{?fedora} %bcond_without tokudb %bcond_without mroonga %bcond_without rocksdb @@ -106,7 +106,7 @@ %bcond_without unbundled_pcre %else %bcond_with unbundled_pcre -%global pcre_bundled_version 8.44 +%global pcre_bundled_version 8.45 %endif # Include systemd files @@ -142,8 +142,8 @@ %global sameevr %{epoch}:%{version}-%{release} Name: mariadb -Version: 10.3.28 -Release: 1%{?with_debug:.debug}%{?dist} +Version: 10.3.32 +Release: 2%{?with_debug:.debug}%{?dist} Epoch: 3 Summary: A very fast and robust SQL database server @@ -1150,7 +1150,7 @@ export MTR_BUILD_THREAD=%{__isa_bits} cd mysql-test perl ./mysql-test-run.pl --parallel=auto --force --retry=1 --ssl \ - --suite-timeout=900 --testcase-timeout=30 \ + --suite-timeout=5000 --testcase-timeout=100 \ --mysqld=--binlog-format=mixed --force-restart \ --shutdown-timeout=60 --max-test-fail=10 --big-test \ --skip-test=spider \ @@ -1358,7 +1358,7 @@ fi %dir %{_libdir}/%{pkg_name} %dir %{_libdir}/%{pkg_name}/plugin %{_libdir}/security/pam_user_map.so -%{_sysconfdir}/security/user_map.conf +%config(noreplace) %{_sysconfdir}/security/user_map.conf %{_libdir}/%{pkg_name}/plugin/* %{?with_oqgraph:%exclude %{_libdir}/%{pkg_name}/plugin/ha_oqgraph.so} %{?with_connect:%exclude %{_libdir}/%{pkg_name}/plugin/ha_connect.so} @@ -1406,7 +1406,6 @@ fi %{_datadir}/%{pkg_name}/mysql_system_tables.sql %{_datadir}/%{pkg_name}/mysql_system_tables_data.sql %{_datadir}/%{pkg_name}/mysql_test_data_timezone.sql -%{_datadir}/%{pkg_name}/mysql_to_mariadb.sql %{_datadir}/%{pkg_name}/mysql_performance_tables.sql %{_datadir}/%{pkg_name}/mysql_test_db.sql %if %{with mroonga} @@ -1588,6 +1587,24 @@ fi %endif %changelog +* Mon Jan 17 2022 Zuzana Miklankova - 3:10.3.32-2 +- Add delaycompress option to the logrotate script + +* Wed Jan 12 2022 Zuzana Miklankova - 3:10.3.32-1 +- Rebase to 10.3.32 + +* Tue Jan 11 2022 Zuzana Miklankova - 3:10.3.31-1 +- Rebase to 10.3.31 + +* Fri Sep 24 2021 Lukas Javorsky - 3:10.3.30-1 +- Rebase to 10.3.30 + +* Mon Aug 09 2021 Lukas Javorsky - 3:10.3.29-2 +- Set user_map.conf file to be noreplace config file + +* Tue May 05 2021 Michal Schorm - 3:10.3.29-1 +- Rebase to 10.3.29 + * Wed Mar 24 2021 Michal Schorm - 3:10.3.28-1 - Rebase to 10.3.28