From f71e91b3792f79b9d582a1ca1798fc6551c148dd Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Jan 08 2018 11:09:38 +0000 Subject: Rebase to 10.1.30 Unstable tests lists updated --- diff --git a/mariadb.spec b/mariadb.spec index 6afe1f7..da66f34 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -60,6 +60,7 @@ %bcond_without config # For deep debugging we need to build binaries with extra debug info +# ISSUE: FTBFS in 10.1.30 version: https://jira.mariadb.org/browse/MDEV-14886 %bcond_with debug # Include files for SysV init or systemd @@ -122,7 +123,7 @@ # Make long macros shorter %global sameevr %{epoch}:%{version}-%{release} %global compatver 10.1 -%global bugfixver 29 +%global bugfixver 30 Name: mariadb Version: %{compatver}.%{bugfixver} @@ -870,6 +871,10 @@ rm %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1* rm %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1* 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 mkdir -p %{buildroot}%{logrotateddir} mv %{buildroot}%{_datadir}/%{pkg_name}/mysql-log-rotate %{buildroot}%{logrotateddir}/%{daemon_name} @@ -1337,6 +1342,13 @@ fi %attr(0640,mysql,mysql) %config %ghost %verify(not md5 size mtime) %{logfile} %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 oqgraph} %files oqgraph-engine %config(noreplace) %{_sysconfdir}/my.cnf.d/oqgraph.cnf @@ -1419,6 +1431,9 @@ fi %endif %changelog +* Sat Dec 23 2017 Michal Schorm - 3:10.1.30-1 +- Rebase to 10.1.30 + * Tue Nov 21 2017 Michal Schorm - 3:10.1.29-1 - Rebase to 10.1.29 diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list index edb74a6..609db2d 100644 --- a/rh-skipped-tests-base.list +++ b/rh-skipped-tests-base.list @@ -9,64 +9,20 @@ main.userstat : #1399847 main.multi_update : #1399847 main.set_statement_notembedded_binlog : #1399847 perfschema.nesting : #1399847 -perfschema.socket_summary_by_event_name_func : #1399847 perfschema.socket_summary_by_instance_func : #1399847 -# test that started to fail in 10.1.21 only on i686 only in Fedora Rawhide (F26). 14/02/17 -main.mysql_client_test_nonblock : #1399847 - # needs this tests disabled for mode build +# Update: Fails since 10.1.30 (works only on i686 and ARMv7hl) plugins.feedback_plugin_load : # # ---- -# Failing from rebase to 10.1.24 +# Failing since rebase to 10.1.24 # issues trackers will be added -encryption.create_or_replace : - -perfschema.nesting : -perfschema.socket_summary_by_event_name_func : -perfschema.socket_summary_by_instance_func : perfschema.cnf_option : innodb.innodb_defrag_binlog : -rpl.rpl_row_img_blobs : -rpl.rpl_row_img_eng_min : -rpl.rpl_row_img_eng_noblob : - sys_vars.log_error_func : sys_vars.log_error_func2 : sys_vars.slave_parallel_threads_basic : - -spider/bg.spider3_fixes : -spider/bg.spider3_fixes_part : -spider/bg.spider_fixes : -spider/bg.spider_fixes_part : -spider/bg.basic_sql : -spider/bg.basic_sql_part : -spider/bg.direct_aggregate : -spider/bg.direct_aggregate_part : -spider/bg.direct_update : -spider/bg.direct_update_part : -spider/bg.function : -spider/bg.ha : -spider/bg.ha_part : -spider/bg.vp_fixes : -spider.spider3_fixes : -spider.spider3_fixes_part : -spider.spider_fixes : -spider.spider_fixes_part : -spider.basic_sql : -spider.basic_sql_part : -spider.direct_aggregate : -spider.direct_aggregate_part : -spider.direct_update : -spider.direct_update_part : -spider.function : -spider.ha : -spider.ha_part : -spider.vp_fixes : - -# Tests failing on PPC -parts.partition_alter4_innodb : diff --git a/rh-skipped-tests-ppc-s390.list b/rh-skipped-tests-ppc-s390.list index e69de29..1f70305 100644 --- a/rh-skipped-tests-ppc-s390.list +++ b/rh-skipped-tests-ppc-s390.list @@ -0,0 +1,11 @@ +# Fails only on PPC64le +# Fails since 10.1.30 +parts.partition_alter4_innodb : +parts.partition_basic_innodb : + +# Fails only on PPC64 +# Fails since 10.1.30 +vcol.vcol_supported_sql_funcs_innodb : + +# Sometimes produces warnings on ppc; since 10.1.30 +parts.partition_alter4_innodb : diff --git a/sources b/sources index f533833..51bd06b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mariadb-10.1.29.tar.gz) = c169dfa2878f9fa9e0e9d12ca79fcbfa644e9b51bb0b78b8dd51d6c5679f3184d139fa96a1ddb25f3ae5d1c0489708c2c624f96a24020f77bf7e5247fac45ecd +SHA512 (mariadb-10.1.30.tar.gz) = 3b123cc04e4bb09d86b7cee2caa21cc8f94b1b562d8762137565a7fa173385b87fc31f7ca4e15ce85c6a1cb45bdca2216d4c49347b75248e2b60b3438b7cc15c