From 43a1c998f2397e94b91731478a235d0e6ebf6f90 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Sat, 18 Jan 2020 15:11:13 +0100
Subject: [PATCH] Rebase to 10.4.11 - Update lists of failing tests

---
 rh-skipped-tests-arm.list  | 24 ------------------------
 rh-skipped-tests-base.list | 32 +++++++++++++++-----------------
 rh-skipped-tests-ppc.list  |  2 --
 rh-skipped-tests-s390.list |  6 ++----
 4 files changed, 17 insertions(+), 47 deletions(-)

diff --git a/rh-skipped-tests-arm.list b/rh-skipped-tests-arm.list
index e235e76..ec37d1b 100644
--- a/rh-skipped-tests-arm.list
+++ b/rh-skipped-tests-arm.list
@@ -1,26 +1,2 @@
-# 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         :
-# 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.9, only on armv7hl
-federated.federatedx_versioning :
-
-# 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 eb84580..2b101f5 100644
--- a/rh-skipped-tests-base.list
+++ b/rh-skipped-tests-base.list
@@ -4,10 +4,6 @@ main.ssl_7937                                : #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 :
-
 # ------------------------------
 # Tests that fails because of 'Self Signed Certificate in the Certificate Chain'
 perfschema.cnf_option                        :
@@ -18,6 +14,16 @@ rpl.rpl_row_img_eng_noblob                   :
 
 sys_vars.slave_parallel_threads_basic        :
 
+# ------------------------------
+# Expected to fail, the plugin is not build with server, but 'mariadb-connector-c' instead
+plugins.auth_ed25519                         :
+plugins.multiauth                            :
+
+# ------------------------------
+perfschema.nesting                           : #1399847
+perfschema.socket_summary_by_instance_func   : #1399847
+perfschema.socket_summary_by_event_name_func :
+
 # ------------------------------
 # Fails since 10.1.12
 innodb.innodb_defrag_binlog                  :
@@ -25,17 +31,9 @@ innodb.innodb_defrag_binlog                  :
 # Fails everywhere since 10.2.15
 main.userstat				     :
 
-# Fails on x86_64 since 10.2.15
-rocksdb.bulk_load                            :
-rocksdb.bulk_load_rev_cf                     :
-rocksdb.bulk_load_rev_cf_and_data            :
-rocksdb.bulk_load_rev_data                   :
+# Fails everywhere since 10.4.11
+main.events_bugs                             :
+sys_vars.tcp_nodelay                         :
 
-# Fails everywhere from 10.3.16
-main.mysql                                   :
-
-# Fails everywhere from 10.3.17
-versioning.update-big                        :
-
-# Expected to fail, the plugin is not build with server, but 'mariadb-connector-c' instead
-plugins.auth_ed25519                        :
\ No newline at end of file
+# Fails on i686
+encryption.innodb-redo-badkey                :
diff --git a/rh-skipped-tests-ppc.list b/rh-skipped-tests-ppc.list
index 53e80b8..e69de29 100644
--- a/rh-skipped-tests-ppc.list
+++ b/rh-skipped-tests-ppc.list
@@ -1,2 +0,0 @@
-# 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 2d82f8a..a7573da 100644
--- a/rh-skipped-tests-s390.list
+++ b/rh-skipped-tests-s390.list
@@ -1,6 +1,4 @@
 # Fails since 10.2.15
 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
+# Fails since 10.4.11
+disks.disks_notembedded        :