diff --git a/9000-disable-some-unstable-testcases.patch b/9000-disable-some-unstable-testcases.patch new file mode 100644 index 0000000000000000000000000000000000000000..fae887c4c4f6306c0c9f50998780d0f4d91a36af --- /dev/null +++ b/9000-disable-some-unstable-testcases.patch @@ -0,0 +1,81 @@ +From ea4fbf5f164c60f736a5e987478dd1a4fc976371 Mon Sep 17 00:00:00 2001 +From: eulerstorage +Date: Mon, 13 Jan 2020 17:35:50 +0800 +Subject: [PATCH] Disable some unstable testcase + +Some testcases are unstable, they will fail if the test environment +is not suitable, for example network is broken. +--- + mysql-test/unstable-tests | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/mysql-test/unstable-tests b/mysql-test/unstable-tests +index 2c28c9a..9ea0ebc 100644 +--- a/mysql-test/unstable-tests ++++ b/mysql-test/unstable-tests +@@ -262,6 +262,7 @@ innodb.truncate_purge_debug : Include fil + innodb.update_time : MDEV-14804 - Wrong result + innodb.undo_log : Include file modified in 10.2.17, 10.3.9 + innodb.xa_recovery : MDEV-15279 - mysqld got exception ++innodb.innodb_defrag_binlog : + + #----------------------------------------------------------------------- + +@@ -389,6 +390,8 @@ main.mysql_upgrade_noengine : MDEV-14355 + main.mysql_upgrade_ssl : MDEV-13492 - Unknown SSL error + main.olap : Modified in 10.3.8 + main.openssl_1 : MDEV-13492 - Unknown SSL error ++main.openssl_6975 : ++main.ssl_cipher : + main.order_by_optimizer_innodb : MDEV-10683 - Wrong result + main.partition_debug_sync : MDEV-15669 - Deadlock found when trying to get lock + main.partition_innodb_plugin : MDEV-12901 - Valgrind warnings +@@ -418,6 +421,11 @@ main.ssl_ca : MDEV-10895 + main.ssl_cert_verify : MDEV-13735 - Server crash + main.ssl_connect : MDEV-13492 - Unknown SSL error + main.ssl_timeout : MDEV-11244 - Crash ++main.ssl_7937 : ++main.ssl_crl_clients : ++main.ssl_8k_key : ++main.ssl : ++main.ssl_cipher : + main.statistics_close : Added in 10.3.8 + main.statistics : Modified in 10.3.8 + main.stat_tables : Modified in 10.1.35, 10.2.17, 10.3.9 +@@ -523,6 +531,7 @@ parts.partition_exch_qa_10 : MDEV-11765 + parts.partition_innodb_status_file : MDEV-12901 - Valgrind + parts.partition_special_innodb : MDEV-16942 - Timeout + parts.truncate_locked : Added in 10.1.35, 10.2.17, 10.3.9 ++parts.partition_alter4_innodb : + + #----------------------------------------------------------------------- + +@@ -549,6 +558,9 @@ perfschema.stage_mdl_global : MDEV-11803 + perfschema.stage_mdl_procedure : MDEV-11545 - Missing row + perfschema.stage_mdl_table : MDEV-12638 - Wrong result + perfschema.threads_mysql : MDEV-10677 - Wrong result ++perfschema.nesting : ++perfschema.socket_summary_by_instance_func : ++perfschema.cnf_option : + + #----------------------------------------------------------------------- + +@@ -716,6 +728,7 @@ rpl.rpl_temporary_error2 : MDEV-10634 + rpl.sec_behind_master-5114 : MDEV-13878 - Wrong result + + rpl/extra/rpl_tests.* : MDEV-10994 - Not maintained ++rpl.rpl_connection : + + #----------------------------------------------------------------------- + +@@ -769,6 +782,7 @@ sys_vars.slow_query_log_func : MDEV-14273 + sys_vars.sysvars_innodb : Modified in 10.3.8 + sys_vars.thread_cache_size_func : MDEV-11775 - Wrong result + sys_vars.wait_timeout_func : MDEV-12896 - Wrong result ++sys_vars.slave_parallel_threads_basic : + + #----------------------------------------------------------------------- + +-- +1.8.3.1 + diff --git a/README.md b/README.md deleted file mode 100644 index 96b506005b41ec52e3a8e1901722195101c65765..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# mariadb - -#### 介绍 -{**以下是码云平台说明，您可以替换此简介** -码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/mariadb-server-galera.te b/mariadb-server-galera.te deleted file mode 100644 index bdce127cfa563899b581cd13ded36fd068026bd4..0000000000000000000000000000000000000000 --- a/mariadb-server-galera.te +++ /dev/null @@ -1,23 +0,0 @@ - -module mariadb-server-galera 1.0; - -require { - type mysqld_t; - type rsync_exec_t; - type anon_inodefs_t; - type proc_net_t; - type kerberos_port_t; - class file { read execute execute_no_trans getattr open }; - class tcp_socket { name_bind name_connect }; - class process { setpgid siginh rlimitinh noatsecure }; -} - -# allow mysqld to run rsyncd -allow mysqld_t self:process setpgid; -allow mysqld_t rsync_exec_t:file { read execute execute_no_trans getattr open }; -allow mysqld_t anon_inodefs_t:file getattr; -allow mysqld_t proc_net_t:file { read open }; - -# allow rsyncd to listen on port 4444 -allow mysqld_t kerberos_port_t:tcp_socket { name_bind name_connect }; - diff --git a/mariadb.spec b/mariadb.spec index c6dd079cc27a06eb50854a38f57733371896543c..a223857c729990a80947093040ce34b088d9df47 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -2,17 +2,18 @@ Name: mariadb Version: 10.3.9 -Release: 4 +Release: 5 Epoch: 3 Summary: One of the most popular database servers License: GPLv2 with exceptions and LGPLv2 and BSD URL: http://mariadb.org Source0: https://downloads.mariadb.org/interstitial/mariadb-%{version}/source/mariadb-%{version}.tar.gz -Source1: mariadb-server-galera.te + +Patch9000: 9000-disable-some-unstable-testcases.patch BuildRequires: selinux-policy-devel, cmake, gcc-c++ -BuildRequires: systemd, systemd-devel, multilib-rpm-config +BuildRequires: systemd, systemd-devel BuildRequires: zlib-devel, lz4-devel, libaio-devel, libedit-devel, ncurses-devel BuildRequires: systemtap-sdt-devel, bison, bison-devel, pam-devel BuildRequires: pcre-devel >= 8.35 pkgconf @@ -191,9 +192,6 @@ This contains test suitte for the developing of MariaDB. %autosetup -n %{name}-%{version} -p1 find . -name "*.jar" -type f -exec rm --verbose -f {} \; -mkdir selinux -sed 's/mariadb-server-galera/%{name}-server-galera/' %{SOURCE1} > selinux/%{name}-server-galera.te - pcre_maj=`grep '^m4_define(pcre_major' pcre/configure.ac | sed -r 's/^m4_define\(pcre_major, \[([0-9]+)\]\)/\1/'` pcre_min=`grep '^m4_define(pcre_minor' pcre/configure.ac | sed -r 's/^m4_define\(pcre_minor, \[([0-9]+)\]\)/\1/'` @@ -282,15 +280,9 @@ cmake -L %make_build VERBOSE=1 -make -C selinux -f /usr/share/selinux/devel/Makefile %{name}-server-galera.pp - %install %make_install - -%multilib_fix_c_header --file %{_includedir}/mysql/server/my_config.h -%multilib_fix_c_header --file %{_includedir}/mysql/server/private/config.h - ln -s mysql_config.1.gz %{buildroot}%{_mandir}/man1/mariadb_config.1.gz mkdir -p %{buildroot}/%{_libdir}/pkgconfig @@ -315,10 +307,6 @@ rm %{buildroot}%{_libexecdir}/rcmysql rm %{buildroot}%{_tmpfilesdir}/tmpfiles.conf echo "d %{_rundir}/%{name} 0755 mysql mysql -" >>%{buildroot}%{_tmpfilesdir}/%{name}.conf - -install -p -m 644 -D selinux/%{name}-server-galera.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp - - mv %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir} ln -s ../../../../../bin/my_safe_process %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process @@ -408,7 +396,6 @@ export MTR_BUILD_THREAD=%{__isa_bits} semanage port -a -t mysqld_port_t -p tcp 4568 &> /dev/null || : semanage port -a -t mysqld_port_t -p tcp 4567 &> /dev/null || : semanage port -a -t mysqld_port_t -p udp 4567 &> /dev/null || : -semodule -i %{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp &> /dev/null || : %post server %systemd_post %{name}.service @@ -555,8 +542,6 @@ fi %{_bindir}/galera_new_cluster %{_bindir}/galera_recovery %{_datadir}/%{name}/systemd/use_galera_new_cluster.conf -%{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp - %files gssapi-server %config(noreplace) %{_sysconfdir}/my.cnf.d/auth_gssapi.cnf @@ -611,6 +596,9 @@ fi %changelog +* Wed Jan 8 2020 openEuler Buildteam - 3:10.3.9-5 +- Repackaged + * Tue Dec 31 2019 openEuler Buildteam - 3:10.3.9-4 - Package rewrap and update the release number