rpms/mariadb10.11
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to 10.5.3

Browse Source 
Add failing tests
This commit is contained in:
Lukas Javorsky 2020-09-14 09:55:21 +02:00 committed by Michal Schorm
parent 8d4561c7a1
commit be6da51b15
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
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.2 Version: 10.5.3
Release: 1%{?with_debug:.debug}%{?dist} Release: 1%{?with_debug:.debug}%{?dist}
Epoch: 3 Epoch: 3
@ -994,7 +994,7 @@ rm %{buildroot}%{_bindir}/mytop
rm %{buildroot}%{_mandir}/man1/mytop.1* rm %{buildroot}%{_mandir}/man1/mytop.1*
# Should be shipped with mariadb-connector-c # Should be shipped with mariadb-connector-c
rm %{buildroot}%{_mandir}/man1/mariadb-config.1* rm %{buildroot}%{_mandir}/man1/mariadb_config.1*
# put logrotate script where it needs to be # put logrotate script where it needs to be
mkdir -p %{buildroot}%{logrotateddir} mkdir -p %{buildroot}%{logrotateddir}
@ -1008,6 +1008,12 @@ install -p -m 0644 %{SOURCE7} %{basename:%{SOURCE7}}
install -p -m 0644 %{SOURCE16} %{basename:%{SOURCE16}} install -p -m 0644 %{SOURCE16} %{basename:%{SOURCE16}}
install -p -m 0644 %{SOURCE71} %{basename:%{SOURCE71}} install -p -m 0644 %{SOURCE71} %{basename:%{SOURCE71}}
# Delete upstreams service files
# We don't use this location of service files
rm %{buildroot}%{_datadir}/%{pkg_name}/systemd/{mysql,mysqld}.service
# These may come handy in a future, but right now we use our own services
rm %{buildroot}/usr/lib/systemd/system/{mysql,mysqld}.service
# install galera config file # install galera config file
%if %{with galera} %if %{with galera}
sed -i -r 's|^wsrep_provider=none|wsrep_provider=%{_libdir}/galera/libgalera_smm.so|' %{_vpath_builddir}/support-files/wsrep.cnf sed -i -r 's|^wsrep_provider=none|wsrep_provider=%{_libdir}/galera/libgalera_smm.so|' %{_vpath_builddir}/support-files/wsrep.cnf
@ -1069,7 +1075,6 @@ rm %{buildroot}%{_libdir}/%{pkg_name}/plugin/auth_gssapi_client.so
rm %{buildroot}%{_bindir}/mysql_config* rm %{buildroot}%{_bindir}/mysql_config*
rm %{buildroot}%{_bindir}/mariadb_config rm %{buildroot}%{_bindir}/mariadb_config
rm %{buildroot}%{_mandir}/man1/mysql_config*.1* rm %{buildroot}%{_mandir}/man1/mysql_config*.1*
unlink %{buildroot}%{_mandir}/man1/mariadb_config.1*
%endif %endif
%if %{without clibrary} && %{with devel} %if %{without clibrary} && %{with devel}
@ -1589,7 +1594,6 @@ fi
%{_bindir}/{mysql_client_test,mysqltest,mariadb-client-test,mariadb-test} %{_bindir}/{mysql_client_test,mysqltest,mariadb-client-test,mariadb-test}
%{_bindir}/my_safe_process %{_bindir}/my_safe_process
%attr(-,mysql,mysql) %{_datadir}/mysql-test %attr(-,mysql,mysql) %{_datadir}/mysql-test
%{_mandir}/man1/mysql_client_test.1*
%{_mandir}/man1/{mysql_client_test,mysqltest,mariadb-client-test,mariadb-test}.1* %{_mandir}/man1/{mysql_client_test,mysqltest,mariadb-client-test,mariadb-test}.1*
%{_mandir}/man1/my_safe_process.1* %{_mandir}/man1/my_safe_process.1*
%{_mandir}/man1/mysql-stress-test.pl.1* %{_mandir}/man1/mysql-stress-test.pl.1*
@ -1597,6 +1601,9 @@ fi
%endif %endif
%changelog %changelog
* Mon Sep 14 2020 Lukas Javorsky <ljavorsk@redhat.com> - 10.5.3-1
- Rebase to 10.5.3
* Fri Sep 11 2020 Michal Schorm <mschorm@redhat.com> - 10.5.2-1 * Fri Sep 11 2020 Michal Schorm <mschorm@redhat.com> - 10.5.2-1
- Test rebase to 10.5.2 - Beta - Test rebase to 10.5.2 - Beta
- TokuDB SE has been deprecated - TokuDB SE has been deprecated

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

@ -42,3 +42,6 @@ encryption.innodb-redo-badkey :
main.mysqld--help2 : main.mysqld--help2 :
disks.disks : disks.disks :
disks.disks_notembedded : disks.disks_notembedded :
# Fails since 10.5.3
main.mysqld--help-aria :

1
rh-skipped-tests-s390.list
View File

@ -1,2 +1,3 @@
# Fails since 10.5.2 # Fails since 10.5.2
perfschema.memory_aggregate_32bit : perfschema.memory_aggregate_32bit :
period.overlaps :

2
sources
View File

@ -1 +1 @@
SHA512 (mariadb-10.5.2.tar.gz) = 7abfc4a5543c35ab49ca164a998ed4b31326cb63f57b15449a5de3b62523d99535f378c8a39835f1e8563cf0cea7fd96b13e4f089cbd1546b5e25256c5f9832f SHA512 (mariadb-10.5.3.tar.gz) = 753b3c6a79193cd290d655114f841355e5ff39c709b07e8dae3c76b35acee31d4c9585d27b515df5dde6a8effe20b955f3eb5ddb89ce01c39ffe6907ede6ffab