diff --git a/0001-disable-some-unstable-testcases.patch b/0001-disable-some-unstable-testcases.patch new file mode 100644 index 0000000000000000000000000000000000000000..83886677f7b5c93229301a900f1c78f4a0dd6c26 --- /dev/null +++ b/0001-disable-some-unstable-testcases.patch @@ -0,0 +1,68 @@ +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 environmentsult +is not suitable, for example network is broken. +---sult + mysql-test/unstable-tests | 14 ++++++++++++++t + 1 file changed, 14 insertions(+) + +diff --git a/mysql-test/unstable-tests b/mysql-test/unstable-tests +index 55a4924..c5e72c5 100644 +--- a/mysql-test/unstable-tests ++++ b/mysql-test/unstable-tests +@@ -219,6 +219,8 @@ main.sp2 : Added in 10.5.4 + main.sp_notembedded : MDEV-10607 - internal error + main.ssl : MDEV-17184 - Failures with OpenSSL 1.1.1 + main.ssl_7937 : MDEV-20958 - Wrong result ++main.ssl_crl_clients : ++main.ssl_8k_key : + main.ssl_ca : MDEV-10895 - SSL connection error on Power + main.ssl_cipher : MDEV-17184 - Failures with OpenSSL 1.1.1 + main.ssl_crl : MDEV-19119 - Wrong error code +@@ -563,6 +565,7 @@ innodb.undo_truncate_recover : MDEV-17679 - Server has gone away + innodb.update_time : MDEV-14804 - Wrong result + innodb.xa_recovery : MDEV-15279 - mysqld got exception; modified in 10.5.4 + innodb.xa_recovery_debug : Modified in 10.5.4 ++innodb.innodb_defrag_binlog : + + #----------------------------------------------------------------------- + +@@ -719,6 +722,7 @@ parts.partition_exch_qa_10 : MDEV-11765 - wrong result + parts.partition_innodb_status_file : MDEV-12901 - Valgrind + parts.partition_special_innodb : MDEV-16942 - Timeout; modified in 10.4.13 + parts.percona_nonflushing_analyze_debug : Added in 10.5.4 ++parts.partition_alter4_innodb : + + #----------------------------------------------------------------------- + +@@ -763,6 +767,8 @@ perfschema.thread_cache : Modified in 10.5.4 + perfschema.threads_history : MDEV-22948 - Wrong result + perfschema.threads_mysql : MDEV-10677 - Wrong result + perfschema.transaction_nested_events : Modified in 10.5.4 ++perfschema.nesting : ++perfschema.cnf_option : + + #----------------------------------------------------------------------- + +@@ -969,6 +975,7 @@ rpl-tokudb.rpl_tokudb_commit_after_flush : MDEV-16966 - Server crash + #----------------------------------------------------------------------- + + rpl/extra/rpl_tests.* : MDEV-10994 - Not maintained ++rpl.rpl_connection : + + #----------------------------------------------------------------------- + +@@ -1055,6 +1062,7 @@ sys_vars.slow_query_log_func : MDEV-14273 - Wrong result + sys_vars.thread_cache_size_func : MDEV-11775 - Wrong result + sys_vars.thread_pool_size_basic : Modified in 10.5.4 + sys_vars.wait_timeout_func : MDEV-12896 - Wrong result; modified in 10.5.4 ++sys_vars.slave_parallel_threads_basic : + + #----------------------------------------------------------------------- + +-- +1.8.3.1 + diff --git a/0002-disable-some-unstable-testcases-2.patch b/0002-disable-some-unstable-testcases-2.patch new file mode 100644 index 0000000000000000000000000000000000000000..8fafa3fc08d282bd5999155601d6dab5d0dfb981 --- /dev/null +++ b/0002-disable-some-unstable-testcases-2.patch @@ -0,0 +1,40 @@ +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 c5e72c5..6c2a4c9 100644 +--- a/mysql-test/unstable-tests ++++ b/mysql-test/unstable-tests +@@ -87,6 +87,7 @@ main.drop_combinations : Added in 10.5.4 + main.drop_table_force : Added in 10.5.4 + main.dyncol : MDEV-19455 - Extra warning + main.errors : Modified in 10.4.13 ++main.events_1 : Skip on ARM + main.events_2 : MDEV-13277 - Crash + main.events_bugs : MDEV-12892 - Crash + main.events_restart : MDEV-12236 - Server shutdown problem; modified in 10.4.13 +@@ -100,6 +101,7 @@ main.fulltext : Modified in 10.4.13 + main.func_bit : Added in 10.5.4 + main.func_gconcat : Modified in 10.5.4 + main.func_json : Modified in 10.5.4 ++main.func_like : Skip on ARM + main.func_math : MDEV-20966 - Wrong error code; modified in 10.5.4 + main.func_str : Modified in 10.4.13 + main.gis : MDEV-13411 - wrong result on P8; modified in 10.5.4 +@@ -282,6 +284,7 @@ binlog.binlog_mixed : Added in 10.5.4 + binlog.binlog_mysqlbinlog_row_frag : Modified in 10.5.4 + binlog.binlog_mysqlbinlog_row_innodb : MDEV-20530 - Binary files differ + binlog.binlog_mysqlbinlog_row_myisam : MDEV-20530 - Binary files differ ++binlog.binlog_mysqlbinlog2 : Skip on ARM + binlog.binlog_no_uniqfile_crash : Added in 10.5.4 + binlog.binlog_row_binlog : MDEV-20213 - Server crash; include file modified in 10.5.4 + binlog.binlog_show_binlog_event_random_pos : MDEV-22473 - Server crash +-- +1.8.3.1 + diff --git a/add-install-db-command.patch b/0003-add-install-db-command.patch similarity index 100% rename from add-install-db-command.patch rename to 0003-add-install-db-command.patch diff --git a/disable-some-unstable-testcases-2.patch b/disable-some-unstable-testcases-2.patch deleted file mode 100644 index 0a2441717b2af2cc415f6d49cc1d27c0a3198a27..0000000000000000000000000000000000000000 --- a/disable-some-unstable-testcases-2.patch +++ /dev/null @@ -1,38 +0,0 @@ -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/disable-some-unstable-testcases.patch b/disable-some-unstable-testcases.patch deleted file mode 100644 index fae887c4c4f6306c0c9f50998780d0f4d91a36af..0000000000000000000000000000000000000000 --- a/disable-some-unstable-testcases.patch +++ /dev/null @@ -1,81 +0,0 @@ -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/mariadb-10.3.9.tar.gz b/mariadb-10.5.4.tar.gz old mode 100644 new mode 100755 similarity index 75% rename from mariadb-10.3.9.tar.gz rename to mariadb-10.5.4.tar.gz index d12c13bcc252ffdf442ebf0c2ec5dcdfed803559..7c2e019422007b01bc25e8eb33ec64ce92d062e7 Binary files a/mariadb-10.3.9.tar.gz and b/mariadb-10.5.4.tar.gz differ diff --git a/mariadb.spec b/mariadb.spec index 0bf437da1bf577ece6dc79a164f056ddf9f34f62..7c01bc74080fbb02d5ddc4a0f966f190c875276f 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -1,8 +1,8 @@ %global runtest 1 Name: mariadb -Version: 10.3.9 -Release: 9 +Version: 10.5.4 +Release: 1 Epoch: 3 Summary: One of the most popular database servers License: GPLv2 with exceptions and LGPLv2 and BSD @@ -10,9 +10,9 @@ URL: http://mariadb.org Source0: https://downloads.mariadb.org/interstitial/mariadb-%{version}/source/mariadb-%{version}.tar.gz -Patch0001: disable-some-unstable-testcases.patch -Patch0002: add-install-db-command.patch -Patch0003: disable-some-unstable-testcases-2.patch +Patch0001: 0001-disable-some-unstable-testcases.patch +Patch0002: 0002-disable-some-unstable-testcases-2.patch +Patch0003: 0003-add-install-db-command.patch BuildRequires: selinux-policy-devel, cmake, gcc-c++ BuildRequires: systemd, systemd-devel @@ -600,6 +600,9 @@ fi %changelog +* Tue Jul 21 2020 jixinjie - 3:10.5.4-1 +- update package to 10.5.4 + * Fri Jul 3 2020 jinzhimin -3:10.3.9-9 - Add conflict between mysql