From 8f4d2fe61f5524ce70c1419e351e9b6e9f23d4a6 Mon Sep 17 00:00:00 2001 From: steven Date: Mon, 2 Mar 2020 19:28:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20mariadb.spec.=20=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=9C=A8=E5=AE=89=E8=A3=85mariadb-test=E8=BF=99=E4=B8=AA?= =?UTF-8?q?=E5=8C=85=E6=97=B6=EF=BC=8C=E6=8F=90=E7=A4=BAperl=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=9A=84=E6=96=87=E4=BB=B6=E4=BE=9D=E8=B5=96=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mariadb.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mariadb.spec b/mariadb.spec index 715d9a5..afc7647 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -2,7 +2,7 @@ Name: mariadb Version: 10.3.9 -Release: 7 +Release: 8 Epoch: 3 Summary: One of the most popular database servers License: GPLv2 with exceptions and LGPLv2 and BSD @@ -33,6 +33,7 @@ Requires: mariadb-connector-c >= 3.0 Suggests: %{name}-server%{?_isa} = %{epoch}:%{version}-%{release} Provides: mariadb-galera = %{epoch}:%{version}-%{release} +%global __requires_exclude ^perl\\((hostnames|lib::mtr|lib::v1|mtr_|My::) %description MariaDB turns data into structured information in a wide array of applications, @@ -597,6 +598,9 @@ fi %changelog +* Mon Mar 2 2020 steven - 3:10.3.9-8 +- Add requires exclude for perls + * Sun Jan 19 2020 openEuler Buildteam - 3:10.3.9-7 - Add mysql_install_db command in service file -- Gitee From 45591ad50488c328da3ffad68f51fc745500503f Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Tue, 3 Mar 2020 17:35:57 +0800 Subject: [PATCH 2/2] skip some unstable test cases and add perls exclude --- ...mand.patch => add-install-db-command.patch | 0 disable-some-unstable-testcases-2.patch | 38 +++++++++++++++++++ ...h => disable-some-unstable-testcases.patch | 0 mariadb.spec | 7 ++-- 4 files changed, 42 insertions(+), 3 deletions(-) rename 9001-add-install-db-command.patch => add-install-db-command.patch (100%) create mode 100644 disable-some-unstable-testcases-2.patch rename 9000-disable-some-unstable-testcases.patch => disable-some-unstable-testcases.patch (100%) diff --git a/9001-add-install-db-command.patch b/add-install-db-command.patch similarity index 100% rename from 9001-add-install-db-command.patch rename to add-install-db-command.patch diff --git a/disable-some-unstable-testcases-2.patch b/disable-some-unstable-testcases-2.patch new file mode 100644 index 0000000..0a24417 --- /dev/null +++ b/disable-some-unstable-testcases-2.patch @@ -0,0 +1,38 @@ +From bc8fd081680454b6b29cac8feb6774fd60b37eb5 Mon Sep 17 00:00:00 2001 +From: eulerstorage +Date: Tue, 3 Mar 2020 17:24:08 +0800 +Subject: [PATCH] skip some unstable test cases + +--- + mysql-test/unstable-tests | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/mysql-test/unstable-tests b/mysql-test/unstable-tests +index 9ea0ebc..99a328b 100644 +--- a/mysql-test/unstable-tests ++++ b/mysql-test/unstable-tests +@@ -41,6 +41,7 @@ binlog.binlog_flush_binlogs_delete_domain : MDEV-14431 + binlog.binlog_killed : MDEV-12925 - Wrong result + binlog.binlog_tmp_table_row : Added in 10.1.35, 10.2.17 + binlog.binlog_xa_recover : MDEV-8517 - Extra checkpoint ++binlog.binlog_mysqlbinlog2 : Skip on ARM + binlog.load_data_stm_view : MDEV-16948 - Wrong result + binlog_tmp_table_row : Added in 10.3.9 + +@@ -346,11 +347,13 @@ main.events_2 : MDEV-13277 + main.events_bugs : MDEV-12892 - Crash + main.events_restart : MDEV-12236 - Server shutdown problem + main.events_slowlog : MDEV-12821 - Wrong result ++main.events_1 : Skip on ARM + main.explain_slowquerylog : Modified in 10.2.16 + main.func_json : Modified in 10.3.9 + main.func_misc : Modified in 10.3.8 + main.func_time_hires : Modified in 10.3.8 + main.func_time : Modified in 10.3.9 ++main.func_like : Skip on ARM + main.gis : MDEV-13411 - wrong result on P8 + main.grant2 : Modified in 10.3.8 + main.grant : Modified in 10.3.9 +-- +1.8.3.1 + diff --git a/9000-disable-some-unstable-testcases.patch b/disable-some-unstable-testcases.patch similarity index 100% rename from 9000-disable-some-unstable-testcases.patch rename to disable-some-unstable-testcases.patch diff --git a/mariadb.spec b/mariadb.spec index afc7647..d264ef0 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -10,8 +10,9 @@ URL: http://mariadb.org Source0: https://downloads.mariadb.org/interstitial/mariadb-%{version}/source/mariadb-%{version}.tar.gz -Patch9000: 9000-disable-some-unstable-testcases.patch -Patch9001: 9001-add-install-db-command.patch +Patch0001: disable-some-unstable-testcases.patch +Patch0002: add-install-db-command.patch +Patch0003: disable-some-unstable-testcases-2.patch BuildRequires: selinux-policy-devel, cmake, gcc-c++ BuildRequires: systemd, systemd-devel @@ -599,7 +600,7 @@ fi %changelog * Mon Mar 2 2020 steven - 3:10.3.9-8 -- Add requires exclude for perls +- Add requires exclude for perls and skip some test cases * Sun Jan 19 2020 openEuler Buildteam - 3:10.3.9-7 - Add mysql_install_db command in service file -- Gitee