From e7b1a35ce0bd30796473090371525b7e1fbd6b2e Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 22 Aug 2018 10:35:55 +0200 Subject: [PATCH] Rebase to 10.3.9 --- mariadb.spec | 11 +++-- rh-skipped-tests-arm.list | 36 +++++++++++++--- rh-skipped-tests-base.list | 31 +++++++------- rh-skipped-tests-ppc.list | 88 +++----------------------------------- rh-skipped-tests-s390.list | 7 +++ sources | 2 +- 6 files changed, 68 insertions(+), 107 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index 5b4d363..37301d2 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -138,8 +138,8 @@ %global sameevr %{epoch}:%{version}-%{release} Name: mariadb -Version: 10.3.8 -Release: 5%{?with_debug:.debug}%{?dist} +Version: 10.3.9 +Release: 1%{?with_debug:.debug}%{?dist} Epoch: 3 Summary: MariaDB: a very fast and robust SQL database server @@ -1117,7 +1117,7 @@ export MTR_BUILD_THREAD=%{__isa_bits} --shutdown-timeout=60 --max-test-fail=5 --big-test \ --skip-test=spider \ %if %{ignore_testsuite_result} - || : + --max-test-fail=9999 || : %else --skip-test-list=unstable-tests %endif @@ -1129,7 +1129,7 @@ export MTR_BUILD_THREAD=%{__isa_bits} --shutdown-timeout=60 --max-test-fail=0 --big-test \ --skip-ssl --suite=spider,spider/bg \ %if %{ignore_testsuite_result} - || : + --max-test-fail=999 || : %endif ) @@ -1544,6 +1544,9 @@ fi %endif %changelog +* Mon Aug 20 2018 Michal Schorm - 3:10.3.9-1 +- Rebase to 10.3.9 + * Fri Aug 10 2018 Petr Lautrbach - 3:10.3.8-5 - Update mariadb-server-galera sub-package to require the correct package with /usr/sbin/semanage diff --git a/rh-skipped-tests-arm.list b/rh-skipped-tests-arm.list index b464903..b05d1a8 100644 --- a/rh-skipped-tests-arm.list +++ b/rh-skipped-tests-arm.list @@ -1,13 +1,37 @@ -# Fails since 10.2.15 -encryption.innodb-encryption-alter : - -# Fails since 10.3.8 +# 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.insert2 : + +# 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 : + +# 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 : diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list index 22a59d9..62a1726 100644 --- a/rh-skipped-tests-base.list +++ b/rh-skipped-tests-base.list @@ -6,16 +6,17 @@ main.ssl_cert_verify : main.ssl_8k_key : +# From 10.3.9 +main.openssl_1 : +main.openssl_6975 : +main.ssl : +main.ssl_cipher : + # -main.non_blocking_api : #1399847 perfschema.nesting : #1399847 perfschema.socket_summary_by_instance_func : #1399847 perfschema.socket_summary_by_event_name_func : -# needs this tests disabled for mode build -plugins.feedback_plugin_load : # -plugins.show_all_plugins : warnings in log - # ------------------------------ # Tests that fails because of 'Self Signed Certificate in the Certificate Chain' perfschema.cnf_option : @@ -27,7 +28,7 @@ rpl.rpl_row_img_eng_noblob : sys_vars.slave_parallel_threads_basic : # ------------------------------ -# Fails since 10.1.12; only x86_64 +# 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 @@ -41,20 +42,20 @@ 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.non_blocking_api : main.userstat : # Fails on x86_64 since 10.2.15 -rocksdb.2pc_group_commit : -rocksdb.read_only_tx : -rocksdb.shutdown : -rocksdb.index_merge_rocksdb2 : +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 : # Fails on ppc and arm since 10.2.15 -binlog.binlog_flush_binlogs_delete_domain : -innodb.innodb_buffer_pool_resize_with_chunks : -innodb.innodb_buffer_pool_resize : -innodb_gis.rtree_compress : innodb_gis.rtree_compress2 : parts.partition_alter4_innodb : + +# Fails from 10.3.9 +encryption.innodb-redo-badkey : diff --git a/rh-skipped-tests-ppc.list b/rh-skipped-tests-ppc.list index 4f0ac99..04bf372 100644 --- a/rh-skipped-tests-ppc.list +++ b/rh-skipped-tests-ppc.list @@ -1,91 +1,17 @@ # 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) -binlog_encryption.encrypted_master : -binlog_encryption.encrypted_slave : - -funcs_1.innodb_trig_03 : -funcs_1.innodb_trig_03e : -funcs_1.innodb_trig_0407 : -funcs_1.innodb_trig_08 : -funcs_1.memory_trig_03 : -funcs_1.memory_trig_03e : -funcs_1.memory_trig_0407 : -funcs_1.memory_trig_08 : -funcs_1.myisam_trig_03 : -funcs_1.myisam_trig_03e : -funcs_1.myisam_trig_0407 : -funcs_1.myisam_trig_08 : -funcs_1.processlist_priv_no_prot : -funcs_1.processlist_val_no_prot : - -innodb.innodb_bug34053 : innodb.temporary_table_optimization : -innodb_zip.cmp_per_index : -main.connect : main.derived_cond_pushdown : -main.events_bugs : -main.grant : -main.grant2 : -main.change_user : -main.lowercase_fs_off : -main.mysql_client_test : -main.mysql_client_test_comp : -main.mysql_client_test_nonblock : -main.mysql_upgrade : -main.mysql_upgrade-6984 : -main.plugin_auth : -main.plugin_auth_qa_1 : main.ps : -main.ps_grant : + +# From 10.3.9 on ppc64le +encryption.create_or_replace : +main.select : +main.select_jcl6 : main.select_pkeycache : -main.set_password_plugin-9835 : -main.show_grants_with_plugin-7985 : -main.sp_notembedded : -main.sp-security : +main.sp : +main.type_float : main.type_newdecimal : main.type_ranges : -main.userstat-badlogin-4824 : -main.view_grant : -parts.partition_alter1_1_innodb : -parts.partition_alter1_2_innodb : -parts.part_supported_sql_func_innodb : - -plugins.auth_ed25519 : - -roles.grant_role_auto_create_user : - -rpl.rpl_create_drop_user : -rpl.rpl_do_grant : -rpl.rpl_temporary : - -sys_vars.old_passwords_func : -sys_vars.secure_auth_func : - -unit.conc_connection : -unit.ed25519 : - -# From 10.2.15 -# "mysqltest: Could not open connection 'default' after 500 attempts: 2002 Can't connect to local MySQL server through socket" -innodb.innodb_defrag_concurrent : - -# Different cause -innodb.innodb_defragment : - -# From 10.3.7 -rpl.rpl_connection : -sql_sequence.alter_notembedded : - - -# From 10.3.8 -gcol.innodb_virtual_basic : -innodb_gis.kill_server : -parts.partition_alter1_1_2_innodb : -parts.partition_alter2_1_2_innodb : -parts.partition_alter2_2_1_innodb : -parts.partition_alter2_2_2_innodb : -parts.partition_alter2_1_1_innodb : -parts.partition_basic_innodb : -innodb_gis.rtree_search : - diff --git a/rh-skipped-tests-s390.list b/rh-skipped-tests-s390.list index e0a897b..00a20ae 100644 --- a/rh-skipped-tests-s390.list +++ b/rh-skipped-tests-s390.list @@ -1,2 +1,9 @@ # 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 : diff --git a/sources b/sources index c5a62da..96374eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mariadb-10.3.8.tar.gz) = e1b61900a06fa57992a2f8516771f5fb98799ed5a4bbe74f858c0fe87b907cc6b600942d6fe97b6064cb39b610a7213cb3bc9634a336f9ebffe11dfe67746422 +SHA512 (mariadb-10.3.9.tar.gz) = 7c7a678fb0c85da64b6df3df17b8cf7f2ccf862e27dcf8535f7403f8693c76b3b1a912f4b6ca876a591ada60a99577a947bfe7a63c602f754332e1e4f689e6e7