packages/mariadb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!19 修改补丁名字，添加perls依赖例外，排除3个不稳定用例

Browse Source 
Merge pull request !19 from steven/master
This commit is contained in:
openeuler-ci-bot 2020-03-03 19:15:14 +08:00 committed by Gitee
commit de864b4754
4 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
9001-add-install-db-command.patch → add-install-db-command.patch
View File

38
disable-some-unstable-testcases-2.patch Normal file
View File

@ -0,0 +1,38 @@
From bc8fd081680454b6b29cac8feb6774fd60b37eb5 Mon Sep 17 00:00:00 2001
From: eulerstorage <eulerstorage@huawei.com>
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

0
9000-disable-some-unstable-testcases.patch → disable-some-unstable-testcases.patch
View File

11
mariadb.spec
View File

@ -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
@ -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
@ -33,6 +34,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 +599,9 @@ fi
%changelog
* Mon Mar 2 2020 steven <steven_ygui@163.com> - 3:10.3.9-8
- Add requires exclude for perls and skip some test cases
* Sun Jan 19 2020 openEuler Buildteam <buildteam@openeuler.org> - 3:10.3.9-7
- Add mysql_install_db command in service file