rpms
/
mariadb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to 10.5.4

This commit is contained in:
Lukas Javorsky 2020-09-18 13:34:42 +02:00 committed by Michal Schorm
parent be6da51b15
commit 2b8b704762
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mariadb-logrotate.patch
View File

@ -26,8 +26,8 @@ Update 6/2018
beeing able to send the SIGHUP to the process and read the mysqld pid file, which root can. 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 * 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.5.4/support-files/mysql-log-rotate.sh.old 2020-09-16 13:36:57.247955135 +0200
+++ mariadb-10.3.19/support-files/mysql-log-rotate.sh_patched 2019-11-06 15:07:54.205379672 +0100 +++ mariadb-10.5.4/support-files/mysql-log-rotate.sh 2020-09-16 13:40:59.744220908 +0200
@@ -3,23 +3,10 @@ @@ -3,23 +3,10 @@
# in the [mysqld] section as follows: # in the [mysqld] section as follows:
# #
@ -58,7 +58,7 @@ Update 6/2018
@@ -27,11 +14,9 @@ @@ -27,11 +14,9 @@
compress compress
postrotate postrotate
# just if mysqld is really running # just if mariadbd is really running
- if test -x @bindir@/mysqladmin && \ - if test -x @bindir@/mysqladmin && \
- @bindir@/mysqladmin ping &>/dev/null - @bindir@/mysqladmin ping &>/dev/null
- then - then

8
mariadb.spec
View File

@ -153,7 +153,7 @@
%global sameevr %{epoch}:%{version}-%{release} %global sameevr %{epoch}:%{version}-%{release}
Name: mariadb Name: mariadb
Version: 10.5.3 Version: 10.5.4
Release: 1%{?with_debug:.debug}%{?dist} Release: 1%{?with_debug:.debug}%{?dist}
Epoch: 3 Epoch: 3
@ -1374,6 +1374,7 @@ fi
%config(noreplace) %{_sysconfdir}/my.cnf.d/%{pkg_name}-server.cnf %config(noreplace) %{_sysconfdir}/my.cnf.d/%{pkg_name}-server.cnf
%config(noreplace) %{_sysconfdir}/my.cnf.d/enable_encryption.preset %config(noreplace) %{_sysconfdir}/my.cnf.d/enable_encryption.preset
%config(noreplace) %{_sysconfdir}/my.cnf.d/spider.cnf
%{_libexecdir}/{mysqld,mariadbd} %{_libexecdir}/{mysqld,mariadbd}
@ -1429,7 +1430,6 @@ fi
%{_mandir}/man1/mysql.server.1* %{_mandir}/man1/mysql.server.1*
%{_datadir}/%{pkg_name}/fill_help_tables.sql %{_datadir}/%{pkg_name}/fill_help_tables.sql
%{_datadir}/%{pkg_name}/install_spider.sql
%{_datadir}/%{pkg_name}/maria_add_gis_sp.sql %{_datadir}/%{pkg_name}/maria_add_gis_sp.sql
%{_datadir}/%{pkg_name}/maria_add_gis_sp_bootstrap.sql %{_datadir}/%{pkg_name}/maria_add_gis_sp_bootstrap.sql
%{_datadir}/%{pkg_name}/mysql_system_tables.sql %{_datadir}/%{pkg_name}/mysql_system_tables.sql
@ -1601,6 +1601,10 @@ fi
%endif %endif
%changelog %changelog
* Wed Sep 16 2020 Lukas Javorsky <ljavorsk@redhat.com> - 10.5.4-1
- Rebase to 10.5.4
- Add spider.cnf to the server config files
* Mon Sep 14 2020 Lukas Javorsky <ljavorsk@redhat.com> - 10.5.3-1 * Mon Sep 14 2020 Lukas Javorsky <ljavorsk@redhat.com> - 10.5.3-1
- Rebase to 10.5.3 - Rebase to 10.5.3

3
rh-skipped-tests-base.list
View File

@ -45,3 +45,6 @@ disks.disks_notembedded :
# Fails since 10.5.3 # Fails since 10.5.3
main.mysqld--help-aria : main.mysqld--help-aria :
# Fails since 10.5.4
main.ssl_system_ca :

2
sources
View File

@ -1 +1 @@
SHA512 (mariadb-10.5.3.tar.gz) = 753b3c6a79193cd290d655114f841355e5ff39c709b07e8dae3c76b35acee31d4c9585d27b515df5dde6a8effe20b955f3eb5ddb89ce01c39ffe6907ede6ffab SHA512 (mariadb-10.5.4.tar.gz) = f949cee6e227e4633f95ab826db7976ed76340eb6dfcbee1eb698e6779b669a8593b2dc733b6a442a60ed95840a627e0551f07a37f2b7738fb03cf1e367f4e1d