From 146358d41432bcf4b5f4eb8cd25128bfec943528 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Tue, 29 May 2018 13:29:49 +0200
Subject: [PATCH] Disable TokuDB build with Jemalloc 5. Add more failing tests
 for the PPC64le.

---
 mariadb.spec              |  7 ++++++-
 rh-skipped-tests-ppc.list | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/mariadb.spec b/mariadb.spec
index fc0c511..ba449a4 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -21,8 +21,9 @@
 # TokuDB engine
 #   https://mariadb.com/kb/en/mariadb/tokudb/
 #   TokuDB engine is available only for x86_64
-#   There's a problem currently with jemalloc, which tokudb use.
+# * There's a problem currently with jemalloc, which tokudb use.
 #   TokuDB does not yet support new Jemalloc 5, but on F>=28, there's only Jemalloc 5. Not a supported configuration.
+# * Disabling build of TokuDB with Jemalloc 5 since it doesn't work. https://jira.percona.com/browse/PS-4393
 #   Also build of TokuDB without Jemalloc is not supported.
 # Mroonga engine
 #   https://mariadb.com/kb/en/mariadb/about-mroonga/
@@ -32,7 +33,11 @@
 #   https://mariadb.com/kb/en/library/myrocks-supported-platforms/
 #   RocksB engine is available only for x86_64
 %if %_arch == x86_64 && 0%{?fedora}
+%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
+%bcond_with tokudb
+%else
 %bcond_without tokudb
+%endif
 %bcond_without mroonga
 %bcond_without rocksdb
 %else
diff --git a/rh-skipped-tests-ppc.list b/rh-skipped-tests-ppc.list
index 74839cc..77fa6a6 100644
--- a/rh-skipped-tests-ppc.list
+++ b/rh-skipped-tests-ppc.list
@@ -37,14 +37,30 @@ main.mysql_upgrade-6984 :
 main.plugin_auth :
 main.plugin_auth_qa_1 :
 main.ps :
+main.ps_grant :
 main.select_pkeycache :
+main.set_password_plugin-9835 :
+main.show_grants_with_plugin-7985 :
+main.sp_notembedded :
+main.sp-security :
+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 :