Apply critical patch for Spider SE on Armv7hl architecture

This commit is contained in:
Michal Schorm 2019-06-21 14:44:07 +02:00
parent dbc826fd1b
commit 1ed43fdb08
2 changed files with 1096 additions and 3 deletions

File diff suppressed because it is too large Load Diff

View File

@ -3,10 +3,10 @@
%global pkgnamepatch mariadb %global pkgnamepatch mariadb
# Regression tests may take a long time (many cores recommended), skip them by # Regression tests may take a long time (many cores recommended), skip them by
%{!?runselftest:%global runselftest 0} %{!?runselftest:%global runselftest 1}
# Set this to 1 to see which tests fail, but 0 on production ready build # Set this to 1 to see which tests fail, but 0 on production ready build
%global ignore_testsuite_result 0 %global ignore_testsuite_result 1
# The last version on which the full testsuite has been run # 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 # In case of further rebuilds of that version, don't require full testsuite to be run
@ -158,7 +158,7 @@
Name: mariadb Name: mariadb
Version: 10.4.6 Version: 10.4.6
Release: 1%{?with_debug:.debug}%{?dist} Release: 2%{?with_debug:.debug}%{?dist}
Epoch: 3 Epoch: 3
Summary: A very fast and robust SQL database server Summary: A very fast and robust SQL database server
@ -204,6 +204,8 @@ Patch9: %{pkgnamepatch}-ownsetup.patch
Patch10: %{pkgnamepatch}-ssl-cipher-tests.patch Patch10: %{pkgnamepatch}-ssl-cipher-tests.patch
# Patch11: Workaround for "chown 0" with priviledges dropped to "mysql" user # Patch11: Workaround for "chown 0" with priviledges dropped to "mysql" user
Patch11: %{pkgnamepatch}-auth_pam_tool_dir.patch Patch11: %{pkgnamepatch}-auth_pam_tool_dir.patch
# Patch13: Fix Spider code on armv7hl; https://jira.mariadb.org/browse/MDEV-18737
Patch13: %{pkgnamepatch}-spider_on_armv7hl.patch
BuildRequires: cmake gcc-c++ BuildRequires: cmake gcc-c++
BuildRequires: multilib-rpm-config BuildRequires: multilib-rpm-config
@ -712,6 +714,7 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \;
%patch9 -p1 %patch9 -p1
#%patch10 -p1 #%patch10 -p1
%patch11 -p1 %patch11 -p1
%patch13 -p1
# workaround for upstream bug #56342 # workaround for upstream bug #56342
#rm mysql-test/t/ssl_8k_key-master.opt #rm mysql-test/t/ssl_8k_key-master.opt
@ -1595,6 +1598,9 @@ fi
%endif %endif
%changelog %changelog
* Fri Jun 21 2019 Michal Schorm <mschorm@redhat.com> - 3:10.4.6-2
- Apply critical patch for Spider SE on Armv7hl architecture
* Thu Jun 20 2019 Michal Schorm <mschorm@redhat.com> - 3:10.4.6-1 * Thu Jun 20 2019 Michal Schorm <mschorm@redhat.com> - 3:10.4.6-1
- Rebase to 10.4.6 - Rebase to 10.4.6