From 0f8030126101a3d1e52edac5dabcbf1c0301df45 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Thu, 1 Aug 2019 20:42:47 +0200 Subject: [PATCH] Rebase to 10.3.17 --- mariadb.spec | 13 ++++++---- rh-skipped-tests-arm.list | 51 +++++++++++++++----------------------- rh-skipped-tests-base.list | 37 +++++++-------------------- rh-skipped-tests-ppc.list | 23 ++--------------- rh-skipped-tests-s390.list | 13 ++++------ sources | 2 +- 6 files changed, 45 insertions(+), 94 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index caac1d0..ca76b20 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -6,12 +6,12 @@ %{!?runselftest:%global runselftest 1} # Set this to 1 to see which tests fail, but 0 on production ready build -%global ignore_testsuite_result 1 +%global ignore_testsuite_result 0 # The last version on which the full testsuite has been run # In case of further rebuilds of that version, don't require full testsuite to be run # run only "main" suite -%global last_tested_version 10.3.16 +%global last_tested_version 10.3.17 # Set to 1 to force run the testsuite even if it was already tested in current version %global force_run_testsuite 0 @@ -110,7 +110,7 @@ %bcond_without unbundled_pcre %else %bcond_with unbundled_pcre -%global pcre_bundled_version 8.42 +%global pcre_bundled_version 8.43 %endif # Use main python interpretter version @@ -152,8 +152,8 @@ %global sameevr %{epoch}:%{version}-%{release} Name: mariadb -Version: 10.3.16 -Release: 2%{?with_debug:.debug}%{?dist} +Version: 10.3.17 +Release: 1%{?with_debug:.debug}%{?dist} Epoch: 3 Summary: A very fast and robust SQL database server @@ -1580,6 +1580,9 @@ fi %endif %changelog +* Thu Aug 01 2019 Michal Schorm - 10.3.17-1 +- Rebase to 10.3.17 + * Thu Jul 25 2019 Fedora Release Engineering - 3:10.3.16-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/rh-skipped-tests-arm.list b/rh-skipped-tests-arm.list index b05d1a8..e235e76 100644 --- a/rh-skipped-tests-arm.list +++ b/rh-skipped-tests-arm.list @@ -1,37 +1,26 @@ # Fails since 10.3.8, only on armv7hl versioning.auto_increment : -versioning.commit_id : -versioning.delete : -versioning.foreign : -versioning.insert : -versioning.insert2 : -versioning.select2 : -versioning.update : +versioning.commit_id : +versioning.delete : +versioning.foreign : +versioning.insert : +versioning.insert2 : +versioning.select2 : +versioning.update : +# Fails since 10.3.9, only on armv7hl +versioning.alter : +versioning.replace : +versioning.select : +versioning.truncate : +versioning.trx_id : +# Fails since 10.3.17, only on armv7hl +versioning.online : +versioning.partition : +versioning.replace : -# Fails since 10.3.8, on both armv7hl and aarch64 -mariabackup.system_versioning : - -# Fails since 10.3.9, on both armv7hl and aarch64 -disks.disks : -encryption.create_or_replace : -federated.federatedx_versioning : # Fails since 10.3.9, only on armv7hl -versioning.alter : -versioning.replace : -versioning.select : -versioning.truncate : -versioning.trx_id : +federated.federatedx_versioning : -# Fails since 10.3.9, only on aarch64 -innodb_gis.kill_server : -innodb_gis.rtree_search : -innodb.innodb_defrag_concurrent : -parts.partition_alter1_1_2_innodb : -parts.partition_alter1_2_innodb : -parts.partition_alter2_1_1_innodb : -parts.partition_alter2_1_2_innodb : -parts.partition_alter2_2_1_innodb : -parts.partition_alter2_2_2_innodb : -parts.partition_basic_innodb : -parts.part_supported_sql_func_innodb : +# Fails from 10.3.17 only on armv7hl +mariabackup.system_versioning : \ No newline at end of file diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list index 23b776e..8f26151 100644 --- a/rh-skipped-tests-base.list +++ b/rh-skipped-tests-base.list @@ -1,10 +1,9 @@ # The SSL test are failing correctly. Fro more explanation, see: # https://jira.mariadb.org/browse/MDEV-8404?focusedCommentId=84275&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-84275 main.ssl_7937 : #1399847 -main.ssl_crl_clients : #1399847 main.ssl_8k_key : +main.ssl_crl : #1399847 -# perfschema.nesting : #1399847 perfschema.socket_summary_by_instance_func : #1399847 perfschema.socket_summary_by_event_name_func : @@ -23,35 +22,17 @@ sys_vars.slave_parallel_threads_basic : # Fails since 10.1.12 innodb.innodb_defrag_binlog : -# on x86_64 after 10.2.12 and 10.2.13 after some unidentified change in Rawhide buildroot -mroonga/storage.index_multiple_column_range_all_used_less_than : -mroonga/storage.index_multiple_column_range_all_used_less_than_or_equal : -mroonga/storage.index_multiple_column_range_partially_used_have_prefix_less_than : -mroonga/storage.index_multiple_column_range_partially_used_have_prefix_less_than_or_equal : -mroonga/storage.index_multiple_column_range_partially_used_no_prefix_less_than : -mroonga/storage.index_multiple_column_range_partially_used_no_prefix_less_than_or_equal : -mroonga/storage.optimization_order_limit_optimized_datetime_less_than : -mroonga/storage.optimization_order_limit_optimized_datetime_less_than_or_equal : - # Fails everywhere since 10.2.15 main.userstat : # Fails on x86_64 since 10.2.15 -rocksdb.bulk_load_errors : -rocksdb.index_merge_rocksdb : -rocksdb.index_merge_rocksdb2 : -rocksdb.read_only_tx : -rocksdb_rpl.mdev12179 : -rocksdb.shutdown : -rocksdb.2pc_group_commit : +rocksdb.bulk_load : +rocksdb.bulk_load_rev_cf : +rocksdb.bulk_load_rev_cf_and_data : +rocksdb.bulk_load_rev_data : -# Fails on ppc and arm since 10.2.15 -innodb_gis.rtree_compress2 : -parts.partition_alter4_innodb : +# Fails everywhere from 10.3.16 +main.mysql : -# Fails from 10.3.9 -encryption.innodb-redo-badkey : - -# Fails from 10.3.16 -main.mysql : -main.func_math : +# Fails everywhere from 10.3.17 +versioning.update-big : diff --git a/rh-skipped-tests-ppc.list b/rh-skipped-tests-ppc.list index dd5050c..53e80b8 100644 --- a/rh-skipped-tests-ppc.list +++ b/rh-skipped-tests-ppc.list @@ -1,21 +1,2 @@ -# 10.2.12 & 10.2.13 after some uninedtified Rawhide (and the forked f28) buildroot change -# failed: 1045: Access denied for user '.....'@'localhost' (using password: YES) -innodb.temporary_table_optimization : - -main.derived_cond_pushdown : -main.ps : - -# From 10.3.9 on ppc64le -encryption.create_or_replace : -main.select : -main.select_jcl6 : -main.select_pkeycache : -main.sp : -main.type_float : -main.type_newdecimal : -main.type_ranges : - -# 10.3.10 -parts.partition_alter1_2_innodb : -parts.partition_alter1_1_2_innodb : -innodb.innodb_defrag_concurrent : +# Fails from 10.3.17 +innodb.innodb_buffer_pool_resize : diff --git a/rh-skipped-tests-s390.list b/rh-skipped-tests-s390.list index 00a20ae..2d82f8a 100644 --- a/rh-skipped-tests-s390.list +++ b/rh-skipped-tests-s390.list @@ -1,9 +1,6 @@ # Fails since 10.2.15 -disks.disks : - -# Fails since 10.3.9 -binlog.binlog_flush_binlogs_delete_domain : -handler.heap : -handler.interface : -innodb_fts.innodb_fts_misc : -rpl.rpl_gtid_delete_domain : +disks.disks : +# Fails since 10.3.17 +disks.disks_notemysql-test-run : +innodb.innodb_defrag_binlog : +innodb.trx_id_future : \ No newline at end of file diff --git a/sources b/sources index 0b9ac17..3829214 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mariadb-10.3.16.tar.gz) = b22a8c8fa0265f88962432ade71c3f0ec554f7d38042def832cfcb50f3aa1dd77a715c76706ffeae679b95438529b06e98b73b7e219f9c645980802027ec022f +SHA512 (mariadb-10.3.17.tar.gz) = 6fba995d8c284a12f19ee5635f5d69d8fa89fc314f512cd1764b2c4593933baf71a472ddce630463debd3bfbafa1cf5afee3f40d3c4062242f58cea16259561e