Rebase to 10.2.12

Temporary fix for https://jira.mariadb.org/browse/MDEV-14537 removed
TokuDB disabled
Failing tests lists updated
This commit is contained in:
Michal Schorm 2017-12-11 12:55:15 +01:00
parent 1b8fb85b0f
commit bbf3a20d30
5 changed files with 35 additions and 25 deletions

View File

@ -13,6 +13,7 @@
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{pkg_name}-%{version}} %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{pkg_name}-%{version}}
# Use Full RELRO for all binaries (RHBZ#1092548) # Use Full RELRO for all binaries (RHBZ#1092548)
# Deafult since F23 https://fedoraproject.org/wiki/Changes/Harden_All_Packages
%global _hardened_build 1 %global _hardened_build 1
# By default, patch(1) creates backup files when chunks apply with offsets. # By default, patch(1) creates backup files when chunks apply with offsets.
@ -30,7 +31,10 @@
# https://mariadb.com/kb/en/library/myrocks-supported-platforms/ # https://mariadb.com/kb/en/library/myrocks-supported-platforms/
# RocksB engine is available only for x86_64 # RocksB engine is available only for x86_64
%ifarch x86_64 %ifarch x86_64
%bcond_without tokudb # Disable TokuDB since 10.1.12 on F>=28
# It will either "freeze" the testsuite (probabbly stuck in some loop) or ~500 TokuDB tests will fail
# This issue is probabbly caused by updates in Fedora Rwahide (F28) KOJI - like a new GCC and many build tools updates
%bcond_with tokudb
%bcond_without mroonga %bcond_without mroonga
%bcond_without rocksdb %bcond_without rocksdb
%else %else
@ -133,7 +137,7 @@
# Make long macros shorter # Make long macros shorter
%global sameevr %{epoch}:%{version}-%{release} %global sameevr %{epoch}:%{version}-%{release}
%global compatver 10.2 %global compatver 10.2
%global bugfixver 11 %global bugfixver 12
Name: mariadb Name: mariadb
Version: %{compatver}.%{bugfixver} Version: %{compatver}.%{bugfixver}
@ -798,6 +802,8 @@ export CFLAGS CXXFLAGS
# building with PIE # building with PIE
LDFLAGS="$LDFLAGS -pie -Wl,-z,relro,-z,now" LDFLAGS="$LDFLAGS -pie -Wl,-z,relro,-z,now"
export LDFLAGS export LDFLAGS
# Simmilar flags provides MariaDB itself: -DSECURITY_HARDENED=ON
# will elanble -pie and -Wl,-z,relro,-z,now, but also -fstack-protector and -D_FORTIFY_SOURCE=2
%endif %endif
# The INSTALL_xxx macros have to be specified relative to CMAKE_INSTALL_PREFIX # The INSTALL_xxx macros have to be specified relative to CMAKE_INSTALL_PREFIX
@ -833,6 +839,7 @@ export LDFLAGS
-DTMPDIR=/var/tmp \ -DTMPDIR=/var/tmp \
-DENABLED_LOCAL_INFILE=ON \ -DENABLED_LOCAL_INFILE=ON \
-DENABLE_DTRACE=ON \ -DENABLE_DTRACE=ON \
-DSECURITY_HARDENED=%{?hardened_build:ON}%{!?hardened_build:OFF} \
-DWITH_EMBEDDED_SERVER=%{?with_embedded:ON}%{!?with_embedded:OFF} \ -DWITH_EMBEDDED_SERVER=%{?with_embedded:ON}%{!?with_embedded:OFF} \
-DWITH_MARIABACKUP=%{?with_backup:ON}%{!?with_backup:NO} \ -DWITH_MARIABACKUP=%{?with_backup:ON}%{!?with_backup:NO} \
-DWITH_UNIT_TESTS=%{?with_test:ON}%{!?with_test:NO} \ -DWITH_UNIT_TESTS=%{?with_test:ON}%{!?with_test:NO} \
@ -846,14 +853,10 @@ export LDFLAGS
-DPLUGIN_ROCKSDB=%{?with_rocksdb:DYNAMIC}%{!?with_rocksdb:NO} \ -DPLUGIN_ROCKSDB=%{?with_rocksdb:DYNAMIC}%{!?with_rocksdb:NO} \
-DPLUGIN_SPHINX=%{?with_sphinx:DYNAMIC}%{!?with_sphinx:NO} \ -DPLUGIN_SPHINX=%{?with_sphinx:DYNAMIC}%{!?with_sphinx:NO} \
-DPLUGIN_TOKUDB=%{?with_tokudb:DYNAMIC}%{!?with_tokudb:NO} \ -DPLUGIN_TOKUDB=%{?with_tokudb:DYNAMIC}%{!?with_tokudb:NO} \
-DTOKUDB_OK=1 \
-DPLUGIN_CONNECT=%{?with_connect:DYNAMIC}%{!?with_connect:NO} \ -DPLUGIN_CONNECT=%{?with_connect:DYNAMIC}%{!?with_connect:NO} \
%{?with_debug: -DCMAKE_BUILD_TYPE=Debug -DWITH_ASAN=OFF -DWITH_INNODB_EXTRA_DEBUG=ON -DWITH_VALGRIND=ON} \ %{?with_debug: -DCMAKE_BUILD_TYPE=Debug -DWITH_ASAN=OFF -DWITH_INNODB_EXTRA_DEBUG=ON -DWITH_VALGRIND=ON} \
%{?_hardened_build: -DWITH_MYSQLD_LDFLAGS="-pie -Wl,-z,relro,-z,now"} %{?_hardened_build: -DWITH_MYSQLD_LDFLAGS="-pie -Wl,-z,relro,-z,now"}
# -DTOKUDB_OK=1
# ^ is a temporary fix for https://jira.mariadb.org/browse/MDEV-14537
# Print all Cmake options values # Print all Cmake options values
cmake -L cmake -L
@ -980,7 +983,9 @@ rm %{buildroot}%{_datadir}/%{pkg_name}/mysqld_multi.server
# Shipped as a standalona package in Fedora # Shipped as a standalona package in Fedora
rm %{buildroot}%{_bindir}/mytop rm %{buildroot}%{_bindir}/mytop
# Rename sysusers and tmpfiles config files, they should be named after the software they belong to
mv %{buildroot}/usr/lib/sysusers.d/sysusers.conf %{buildroot}/usr/lib/sysusers.d/mariadb.conf
mv %{buildroot}/usr/lib/tmpfiles.d/tmpfiles.conf %{buildroot}/usr/lib/tmpfiles.d/mariadb.conf
# put logrotate script where it needs to be # put logrotate script where it needs to be
mkdir -p %{buildroot}%{logrotateddir} mkdir -p %{buildroot}%{logrotateddir}
@ -1149,9 +1154,10 @@ export MTR_BUILD_THREAD=%{__isa_bits}
# avoid redundant test runs with --binlog-format=mixed # avoid redundant test runs with --binlog-format=mixed
# increase timeouts to prevent unwanted failures during mass rebuilds # increase timeouts to prevent unwanted failures during mass rebuilds
# Failing test debug 02/14/17 # Usefull arguments:
# --do-test=mysql_client_test_nonblock \ # --do-test=mysql_client_test_nonblock \
# --skip-rpl # --skip-rpl
# --suite=roles
( (
set -ex set -ex
@ -1485,6 +1491,13 @@ fi
%attr(0640,mysql,mysql) %config %ghost %verify(not md5 size mtime) %{logfile} %attr(0640,mysql,mysql) %config %ghost %verify(not md5 size mtime) %{logfile}
%config(noreplace) %{logrotateddir}/%{daemon_name} %config(noreplace) %{logrotateddir}/%{daemon_name}
# New systemd feature - used to reconstruct damaged /etc
# https://github.com/MariaDB/server/commit/7bbc6c14d1
%dir /usr/lib/sysusers.d
/usr/lib/sysusers.d/mariadb.conf
%dir /usr/lib/tmpfiles.d
/usr/lib/tmpfiles.d/mariadb.conf
%if %{with cracklib} %if %{with cracklib}
%files cracklib-password-check %files cracklib-password-check
%config(noreplace) %{_sysconfdir}/my.cnf.d/cracklib_password_check.cnf %config(noreplace) %{_sysconfdir}/my.cnf.d/cracklib_password_check.cnf
@ -1608,6 +1621,11 @@ fi
%endif %endif
%changelog %changelog
* Wed Jan 10 2018 Michal Schorm <mschorm@redhat.com> - 3:10.2.12-1
- Rebase to 10.2.12
- Temporary fix for https://jira.mariadb.org/browse/MDEV-14537 removed
- TokuDB disabled
* Mon Dec 11 2017 Michal Schorm <mschorm@redhat.com> - 3:10.2.11-2 * Mon Dec 11 2017 Michal Schorm <mschorm@redhat.com> - 3:10.2.11-2
- Temporary fix for #1523875 removed, bug in Annobin fixed - Temporary fix for #1523875 removed, bug in Annobin fixed
Resolves: #1523875 Resolves: #1523875

View File

@ -2,13 +2,10 @@
# https://jira.mariadb.org/browse/MDEV-8404?focusedCommentId=84275&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-84275 # https://jira.mariadb.org/browse/MDEV-8404?focusedCommentId=84275&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-84275
main.ssl_7937 : #1399847 main.ssl_7937 : #1399847
main.ssl_crl_clients : #1399847 main.ssl_crl_clients : #1399847
main.ssl_cert_verify : #1399847
# #
main.userstat : #1399847
main.non_blocking_api : #1399847 main.non_blocking_api : #1399847
perfschema.nesting : #1399847 perfschema.nesting : #1399847
perfschema.socket_summary_by_event_name_func : #1399847
perfschema.socket_summary_by_instance_func : #1399847 perfschema.socket_summary_by_instance_func : #1399847
# <mkocka@redhat.com> needs this tests disabled for mode build # <mkocka@redhat.com> needs this tests disabled for mode build
@ -27,14 +24,18 @@ rpl.rpl_row_img_eng_noblob :
sys_vars.slave_parallel_threads_basic : sys_vars.slave_parallel_threads_basic :
# Fails since 10.1.12
innodb.innodb_defrag_binlog :
# Fails on PPC, PPC64 and AArch
parts.partition_alter4_innodb : #1399847
# https://jira.mariadb.org/browse/MDEV-14003 # https://jira.mariadb.org/browse/MDEV-14003
spider/bg.spider3_fixes :
spider/bg.spider3_fixes_part : spider/bg.spider3_fixes_part :
spider/bg.spider_fixes : spider/bg.spider_fixes :
spider/bg.spider_fixes_part : spider/bg.spider_fixes_part :
spider/bg.basic_sql : spider/bg.basic_sql :
spider/bg.basic_sql_part : spider/bg.basic_sql_part :
spider/bg.direct_aggregate :
spider/bg.direct_aggregate_part : spider/bg.direct_aggregate_part :
spider/bg.direct_update : spider/bg.direct_update :
spider/bg.direct_update_part : spider/bg.direct_update_part :
@ -55,4 +56,3 @@ spider.function :
spider.ha : spider.ha :
spider.ha_part : spider.ha_part :
spider.vp_fixes : spider.vp_fixes :

View File

@ -1,4 +1,2 @@
parts.partition_alter4_innodb : #1399847 # Fails since 10.1.12 only on PPC64
connect.tbl_thread : warnings in log innodb_fts.fulltext :
partition_alter1_2_innodb : warnings in log
partition_alter2_1_1_innodb : warnings in log

View File

@ -1,6 +0,0 @@
encryption.innodb-read-only : #1399847
multi_source.gtid : warnings in log
sys_vars.innodb_autoextend_increment_basic : warnings in log
vcol.vcol_keys_innodb : warnings in log
encryption.innodb-compressed-blob : started failing with 10.2.11 release

View File

@ -1 +1 @@
SHA512 (mariadb-10.2.11.tar.gz) = 4041ee1f1e266e8b30f85b19c5c95bcb626f965df9e0e20eb801598cc7fc5f5f37906e8a75cc86d373aa642adcccf3b75a0e67994e18908fb733cc6520d04a44 SHA512 (mariadb-10.2.12.tar.gz) = 8d3d3c84d4a01d6047e4f2b6802eb802e1f6a7b0e10e981c7ef9fdd27a5a25baab0af47a21b8637f4cbb9d21ef3bcc85097c5fdb8745c2a79040ab87fecb5a7b