diff --git a/mariadb-auth_pam_tool_dir.patch b/mariadb-auth_pam_tool_dir.patch
index 2122190..6334812 100644
--- a/mariadb-auth_pam_tool_dir.patch
+++ b/mariadb-auth_pam_tool_dir.patch
@@ -5,11 +5,11 @@ Thus "chown 0" will always fail
 Never parse 'ls' output!
 http://mywiki.wooledge.org/BashFAQ/087
 
---- mariadb-10.4.7/scripts/mysql_install_db.sh	2019-07-30 13:32:16.000000000 +0200
-+++ mariadb-10.4.7/scripts/mysql_install_db.sh_patched	2019-08-22 16:29:28.341484925 +0200
-@@ -490,13 +490,16 @@ then
-   fi
-   if test -z "$srcdir"
+--- mariadb-10.4.12/scripts/mysql_install_db.sh	2020-01-26 21:43:53.000000000 +0100
++++ mariadb-10.4.12/scripts/mysql_install_db.sh_patched	2020-01-29 11:11:09.448812331 +0100
+@@ -482,13 +482,16 @@ if test -n "$user"
+ then
+   if test -z "$srcdir" -a "$in_rpm" -eq 0
    then
 -    chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" && \
 -    chmod 04755 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool"
@@ -21,9 +21,9 @@ http://mywiki.wooledge.org/BashFAQ/087
 +      if test $? -ne 0
 +      then
          echo "Couldn't set an owner to '$pamtooldir/auth_pam_tool_dir/auth_pam_tool'."
-         echo " It must be root, the PAM authentication plugin doesn't work otherwise.."
+         echo "It must be root, the PAM authentication plugin doesn't work otherwise.."
          echo
 +      fi
      fi
-   fi
-   args="$args --user=$user"
+     chown $user "$pamtooldir/auth_pam_tool_dir" && \
+     chmod 0700 "$pamtooldir/auth_pam_tool_dir"
diff --git a/mariadb-debug_build.patch b/mariadb-debug_build.patch
new file mode 100644
index 0000000..e3cfc69
--- /dev/null
+++ b/mariadb-debug_build.patch
@@ -0,0 +1,28 @@
+Remove the '-Werror' GCC compilation flag, so the debug build compilation won't crash on random warnings.
+
+'-Werror' is not your friend:
+https://embeddedartistry.com/blog/2017/5/3/-werror-is-not-your-friend
+
+--- mariadb-10.3.17/cmake/maintainer.cmake	2019-07-28 02:18:30.000000000 +0200
++++ mariadb-10.3.17/cmake/maintainer.cmake_patched	2019-09-03 13:41:49.082088685 +0200
+@@ -33,7 +33,6 @@ SET(MY_WARNING_FLAGS
+   -Wnon-virtual-dtor
+   -Wvla
+   -Wwrite-strings
+-  -Werror
+   )
+ 
+ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0.0")
+--- mariadb-10.3.17/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake	2019-07-28 02:18:32.000000000 +0200
++++ mariadb-10.3.17/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake_patched	2019-09-03 13:53:51.813324055 +0200
+@@ -163,8 +163,8 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL C
+ endif ()
+ 
+ ## always want these in debug builds
+-set(CMAKE_C_FLAGS_DEBUG "-Wall -Werror ${CMAKE_C_FLAGS_DEBUG}")
+-set(CMAKE_CXX_FLAGS_DEBUG "-Wall -Werror ${CMAKE_CXX_FLAGS_DEBUG}")
++set(CMAKE_C_FLAGS_DEBUG "-Wall ${CMAKE_C_FLAGS_DEBUG}")
++set(CMAKE_CXX_FLAGS_DEBUG "-Wall ${CMAKE_CXX_FLAGS_DEBUG}")
+ 
+ # pick language dialect
+ set(CMAKE_C_FLAGS "-std=c99 ${CMAKE_C_FLAGS}")
diff --git a/mariadb-groonga.patch b/mariadb-groonga.patch
new file mode 100644
index 0000000..3a0e74c
--- /dev/null
+++ b/mariadb-groonga.patch
@@ -0,0 +1,30 @@
+# Fixing conflict with groonga package
+# https://bugzilla.redhat.com/show_bug.cgi?id=1763287
+
+--- mariadb-10.3.18/storage/mroonga/vendor/groonga/CMakeLists.txt.withoutoption	2019-11-11 14:01:07.762595716 +0100
++++ mariadb-10.3.18/storage/mroonga/vendor/groonga/CMakeLists.txt	2019-11-11 14:33:05.224012458 +0100
+@@ -86,7 +86,9 @@
+ set(INCLUDE_DIR "include")
+ set(GRN_INCLUDE_DIR "include/groonga")
+ set(DATA_DIR "share")
+-set(GRN_DATA_DIR "${DATA_DIR}/${GRN_PROJECT_NAME}")
++if(NOT DEFINED GRN_DATA_DIR)
++    set(GRN_DATA_DIR "${DATA_DIR}/${GRN_PROJECT_NAME}")
++endif()
+ set(CONFIG_DIR "etc")
+ set(GRN_CONFIG_DIR "${CONFIG_DIR}/${GRN_PROJECT_NAME}")
+ set(GRN_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${GRN_CONFIG_DIR}/groonga.conf")
+
+--- mariadb-10.3.18/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt.withoutoption	2019-11-11 14:34:22.661005715 +0100
++++ mariadb-10.3.18/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt	2019-11-11 14:35:59.962244120 +0100
+@@ -16,7 +16,9 @@
+ # MA 02110-1335  USA
+ 
+ cmake_minimum_required(VERSION 2.6)
+-set(GROONGA_NORMALIZER_MYSQL_PROJECT_NAME "groonga-normalizer-mysql")
++if (NOT DEFINED GROONGA_NORMALIZER_MYSQL_PROJECT_NAME)
++    set(GROONGA_NORMALIZER_MYSQL_PROJECT_NAME "groonga-normalizer-mysql")
++endif()
+ project("${GROONGA_NORMALIZER_MYSQL_PROJECT_NAME}")
+ 
+ if(DEFINED GROONGA_NORMALIZER_MYSQL_EMBED)
diff --git a/mariadb-myrocks-hotbackup.patch b/mariadb-myrocks-hotbackup.patch
deleted file mode 100644
index ff2a1b1..0000000
--- a/mariadb-myrocks-hotbackup.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Do not import commands library as it is not used
-
-It also makes the script not work on python3, but since the script already uses
-subprocess in practice, removing commands import is effectively no change and
-fixes the python3 compatibility.
-
-Upstream PR: https://github.com/MariaDB/server/pull/1080
-
-From 9c89fd49a757a87ba5899b3548b0fb1d172c0ec3 Mon Sep 17 00:00:00 2001
-From: Honza Horak <hhorak@redhat.com>
-Date: Wed, 9 Jan 2019 15:05:02 +0100
-Subject: [PATCH] Do not import commands library as it is not used
-
----
- storage/rocksdb/myrocks_hotbackup.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/storage/rocksdb/myrocks_hotbackup.py b/storage/rocksdb/myrocks_hotbackup.py
-index 69c75b7cbfd..906ba814776 100755
---- a/storage/rocksdb/myrocks_hotbackup.py
-+++ b/storage/rocksdb/myrocks_hotbackup.py
-@@ -8,7 +8,6 @@ import os
- import stat
- import sys
- import re
--import commands
- import subprocess
- import logging
- import logging.handlers
--- 
-2.17.2
-
diff --git a/mariadb-pcdir.patch b/mariadb-pcdir.patch
new file mode 100644
index 0000000..d9a8a78
--- /dev/null
+++ b/mariadb-pcdir.patch
@@ -0,0 +1,20 @@
+Use PCDIR CMake option, if configured
+
+Upstream install the server pkgconfig file into arch-independent directory
+Reported to upstream as: https://jira.mariadb.org/browse/MDEV-14340
+
+--- mariadb-10.3.12/support-files/CMakeLists.txt	2019-03-20 15:25:53.423283135 +0100
++++ mariadb-10.3.12/support-files/CMakeLists.txt_patched	2019-03-20 15:38:56.372819958 +0100
+@@ -82,7 +82,12 @@ IF(UNIX)
+ 
+   CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
+   CONFIGURE_FILE(rpm/server.cnf ${CMAKE_CURRENT_BINARY_DIR}/rpm/server.cnf @ONLY)
++IF(INSTALL_PCDIR)
++  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_PCDIR} COMPONENT Development)
++ELSE()
+   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)
++ENDIF()
++
+ 
+   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
+   
diff --git a/mariadb-spider_on_armv7hl.patch b/mariadb-spider_on_armv7hl.patch
index 6be8528..e4e6694 100644
--- a/mariadb-spider_on_armv7hl.patch
+++ b/mariadb-spider_on_armv7hl.patch
@@ -1,16 +1,16 @@
 Fix for:
 https://jira.mariadb.org/browse/MDEV-18737
 Taken from:
-https://github.com/MariaDB/server/commit/80f9bd3d9c4f1b6367487a88e4ca816fcb8ce186
+https://github.com/MariaDB/server/commit/ddce85907611e0533d6226de7f53e751cf173f6a
 
 
 
 
 
-From 80f9bd3d9c4f1b6367487a88e4ca816fcb8ce186 Mon Sep 17 00:00:00 2001
-From: Kentoku <kentokushiba@gmail.com>
-Date: Tue, 18 Jun 2019 01:43:07 +0900
-Subject: [PATCH] MDEV-18737 Spider "Out of memory" on armv7hl
+From 3faf5d4c1c3274a20a92cb3eb7eb2de6140894d6 Mon Sep 17 00:00:00 2001
+From: Kentoku SHIBA <kentokushiba@gmail.com>
+Date: Thu, 25 Jul 2019 22:52:45 +0900
+Subject: [PATCH] MDEV-18737 Spider "Out of memory" on armv7hl (#1363)
 
 This is an issue of memory alignment of variable argument when calling my_multi_malloc().
 The fix is strictly casting allocating size to "uint".
@@ -20,20 +20,20 @@ The fix is strictly casting allocating size to "uint".
  storage/spider/spd_copy_tables.cc      |  25 ++--
  storage/spider/spd_db_conn.cc          |  13 +-
  storage/spider/spd_db_handlersocket.cc |   4 +-
- storage/spider/spd_db_mysql.cc         |  12 +-
+ storage/spider/spd_db_mysql.cc         |  10 +-
  storage/spider/spd_db_oracle.cc        |  24 ++--
  storage/spider/spd_direct_sql.cc       |  78 +++++------
  storage/spider/spd_group_by_handler.cc |   7 +-
  storage/spider/spd_ping_table.cc       |  36 +++--
  storage/spider/spd_table.cc            | 134 ++++++++++---------
  storage/spider/spd_trx.cc              | 173 +++++++++++++------------
- 12 files changed, 328 insertions(+), 283 deletions(-)
+ 12 files changed, 327 insertions(+), 282 deletions(-)
 
 diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc
-index 33e81201fff..d3bc24dc0e0 100644
+index 967d2c6e5de..e04f0c8ef55 100644
 --- a/storage/spider/ha_spider.cc
 +++ b/storage/spider/ha_spider.cc
-@@ -395,15 +395,24 @@ int ha_spider::open(
+@@ -394,15 +394,24 @@ int ha_spider::open(
    {
      if (!(searched_bitmap = (uchar *)
        spider_bulk_malloc(spider_current_trx, 15, MYF(MY_WME),
@@ -67,7 +67,7 @@ index 33e81201fff..d3bc24dc0e0 100644
          NullS))
      ) {
        error_num = HA_ERR_OUT_OF_MEM;
-@@ -11389,7 +11398,7 @@ int ha_spider::create(
+@@ -11317,7 +11326,7 @@ int ha_spider::create(
      if (!(tmp_share.static_key_cardinality = (longlong *)
        spider_bulk_malloc(spider_current_trx, 246, MYF(MY_WME),
          &tmp_share.static_key_cardinality,
@@ -76,7 +76,7 @@ index 33e81201fff..d3bc24dc0e0 100644
          NullS))
      ) {
        error_num = HA_ERR_OUT_OF_MEM;
-@@ -12198,7 +12207,8 @@ int ha_spider::info_push(
+@@ -12126,7 +12135,8 @@ int ha_spider::info_push(
            spider_free(spider_current_trx, hs_pushed_ret_fields, MYF(0));
          if (!(hs_pushed_ret_fields = (uint32 *)
            spider_bulk_malloc(spider_current_trx, 17, MYF(MY_WME),
@@ -86,7 +86,7 @@ index 33e81201fff..d3bc24dc0e0 100644
            NullS))
          ) {
            DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-@@ -13762,8 +13772,8 @@ SPIDER_BULK_ACCESS_LINK *ha_spider::create_bulk_access_link()
+@@ -13690,8 +13700,8 @@ SPIDER_BULK_ACCESS_LINK *ha_spider::create_bulk_access_link()
  */
    if (!(bulk_access_link = (SPIDER_BULK_ACCESS_LINK *)
      spider_bulk_malloc(spider_current_trx, 168, MYF(MY_WME),
@@ -98,10 +98,10 @@ index 33e81201fff..d3bc24dc0e0 100644
    ) {
      goto error_bulk_malloc;
 diff --git a/storage/spider/spd_conn.cc b/storage/spider/spd_conn.cc
-index b1f49f4f250..2f372d8f692 100644
+index 911c9bc95ac..f8ca9108061 100644
 --- a/storage/spider/spd_conn.cc
 +++ b/storage/spider/spd_conn.cc
-@@ -472,30 +472,30 @@ SPIDER_CONN *spider_create_conn(
+@@ -470,30 +470,30 @@ SPIDER_CONN *spider_create_conn(
  #endif
      if (!(conn = (SPIDER_CONN *)
        spider_bulk_malloc(spider_current_trx, 18, MYF(MY_WME | MY_ZEROFILL),
@@ -147,7 +147,7 @@ index b1f49f4f250..2f372d8f692 100644
          NullS))
      ) {
        *error_num = HA_ERR_OUT_OF_MEM;
-@@ -594,13 +594,13 @@ SPIDER_CONN *spider_create_conn(
+@@ -592,13 +592,13 @@ SPIDER_CONN *spider_create_conn(
    } else if (conn_kind == SPIDER_CONN_KIND_HS_READ) {
      if (!(conn = (SPIDER_CONN *)
        spider_bulk_malloc(spider_current_trx, 19, MYF(MY_WME | MY_ZEROFILL),
@@ -167,7 +167,7 @@ index b1f49f4f250..2f372d8f692 100644
          NullS))
      ) {
        *error_num = HA_ERR_OUT_OF_MEM;
-@@ -636,13 +636,13 @@ SPIDER_CONN *spider_create_conn(
+@@ -634,13 +634,13 @@ SPIDER_CONN *spider_create_conn(
    } else {
      if (!(conn = (SPIDER_CONN *)
        spider_bulk_malloc(spider_current_trx, 20, MYF(MY_WME | MY_ZEROFILL),
@@ -187,7 +187,7 @@ index b1f49f4f250..2f372d8f692 100644
          NullS))
      ) {
        *error_num = HA_ERR_OUT_OF_MEM;
-@@ -3648,13 +3648,16 @@ int spider_create_mon_threads(
+@@ -3634,13 +3634,16 @@ int spider_create_mon_threads(
        }
        if (!(share->bg_mon_thds = (THD **)
          spider_bulk_malloc(spider_current_trx, 23, MYF(MY_WME | MY_ZEROFILL),
@@ -263,10 +263,10 @@ index 13c53220b16..1a472e2c12b 100644
    ) {
      my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM);
 diff --git a/storage/spider/spd_db_conn.cc b/storage/spider/spd_db_conn.cc
-index f3d607cd6dc..6d3a88a55db 100644
+index cc4599ce0b3..f7178293b05 100644
 --- a/storage/spider/spd_db_conn.cc
 +++ b/storage/spider/spd_db_conn.cc
-@@ -2683,7 +2683,8 @@ int spider_db_fetch_for_item_sum_func(
+@@ -2643,7 +2643,8 @@ int spider_db_fetch_for_item_sum_func(
            if (!spider->direct_aggregate_item_first)
            {
              if (!spider_bulk_malloc(spider_current_trx, 240, MYF(MY_WME),
@@ -276,7 +276,7 @@ index f3d607cd6dc..6d3a88a55db 100644
                NullS)
              ) {
                DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-@@ -2702,7 +2703,7 @@ int spider_db_fetch_for_item_sum_func(
+@@ -2662,7 +2663,7 @@ int spider_db_fetch_for_item_sum_func(
            {
              if (!spider_bulk_malloc(spider_current_trx, 241, MYF(MY_WME),
                &spider->direct_aggregate_item_current->next,
@@ -285,7 +285,7 @@ index f3d607cd6dc..6d3a88a55db 100644
              ) {
                DBUG_RETURN(HA_ERR_OUT_OF_MEM);
              }
-@@ -4074,8 +4075,8 @@ int spider_db_store_result(
+@@ -4034,8 +4035,8 @@ int spider_db_store_result(
        current->field_count = field_count;
        if (!(position = (SPIDER_POSITION *)
          spider_bulk_malloc(spider_current_trx, 7, MYF(MY_WME | MY_ZEROFILL),
@@ -296,7 +296,7 @@ index f3d607cd6dc..6d3a88a55db 100644
            NullS))
        )
          DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-@@ -10948,8 +10949,8 @@ int spider_db_udf_copy_tables(
+@@ -10814,8 +10815,8 @@ int spider_db_udf_copy_tables(
    DBUG_ENTER("spider_db_udf_copy_tables");
    if (!(last_row_pos = (ulong *)
      spider_bulk_malloc(spider_current_trx, 30, MYF(MY_WME),
@@ -308,7 +308,7 @@ index f3d607cd6dc..6d3a88a55db 100644
    ) {
      my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM);
 diff --git a/storage/spider/spd_db_handlersocket.cc b/storage/spider/spd_db_handlersocket.cc
-index ac81525092b..27257ee08e6 100644
+index 1e42838f40a..1e88ad4a59a 100644
 --- a/storage/spider/spd_db_handlersocket.cc
 +++ b/storage/spider/spd_db_handlersocket.cc
 @@ -505,8 +505,8 @@ SPIDER_DB_ROW *spider_db_handlersocket_row::clone()
@@ -323,10 +323,10 @@ index ac81525092b..27257ee08e6 100644
    ) {
      delete clone_row;
 diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc
-index 58351195a61..da2052ad79e 100644
+index 1b62b4a9bd5..947a614f11e 100644
 --- a/storage/spider/spd_db_mysql.cc
 +++ b/storage/spider/spd_db_mysql.cc
-@@ -537,9 +537,9 @@ SPIDER_DB_ROW *spider_db_mbase_row::clone()
+@@ -523,9 +523,9 @@ SPIDER_DB_ROW *spider_db_mbase_row::clone()
      row_size = record_size + field_count;
    }
    if (!spider_bulk_malloc(spider_current_trx, 29, MYF(MY_WME),
@@ -339,7 +339,7 @@ index 58351195a61..da2052ad79e 100644
      NullS)
    ) {
      delete clone_row;
-@@ -13786,7 +13786,7 @@ int spider_mbase_handler::init_union_table_name_pos()
+@@ -13519,7 +13519,7 @@ int spider_mbase_handler::init_union_table_name_pos()
    if (!union_table_name_pos_first)
    {
      if (!spider_bulk_malloc(spider_current_trx, 236, MYF(MY_WME),
@@ -348,7 +348,7 @@ index 58351195a61..da2052ad79e 100644
        NullS)
      ) {
        DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-@@ -13807,7 +13807,7 @@ int spider_mbase_handler::set_union_table_name_pos()
+@@ -13540,7 +13540,7 @@ int spider_mbase_handler::set_union_table_name_pos()
      if (!union_table_name_pos_current->next)
      {
        if (!spider_bulk_malloc(spider_current_trx, 237, MYF(MY_WME),
@@ -358,7 +358,7 @@ index 58351195a61..da2052ad79e 100644
        ) {
          DBUG_RETURN(HA_ERR_OUT_OF_MEM);
 diff --git a/storage/spider/spd_db_oracle.cc b/storage/spider/spd_db_oracle.cc
-index 773c6b90ed9..0c74415f6b2 100644
+index 08d7d3e083d..d869afc61f4 100644
 --- a/storage/spider/spd_db_oracle.cc
 +++ b/storage/spider/spd_db_oracle.cc
 @@ -588,16 +588,16 @@ int spider_db_oracle_row::init()
@@ -388,7 +388,7 @@ index 773c6b90ed9..0c74415f6b2 100644
          NullS)
      ) ||
      !(val_str = new spider_string[field_count])
-@@ -12519,7 +12519,7 @@ int spider_oracle_handler::init_union_table_name_pos()
+@@ -12487,7 +12487,7 @@ int spider_oracle_handler::init_union_table_name_pos()
    if (!union_table_name_pos_first)
    {
      if (!spider_bulk_malloc(spider_current_trx, 238, MYF(MY_WME),
@@ -397,7 +397,7 @@ index 773c6b90ed9..0c74415f6b2 100644
        NullS)
      ) {
        DBUG_RETURN(HA_ERR_OUT_OF_MEM);
-@@ -12540,7 +12540,7 @@ int spider_oracle_handler::set_union_table_name_pos()
+@@ -12508,7 +12508,7 @@ int spider_oracle_handler::set_union_table_name_pos()
      if (!union_table_name_pos_current->next)
      {
        if (!spider_bulk_malloc(spider_current_trx, 239, MYF(MY_WME),
@@ -615,10 +615,10 @@ index 431d46063c3..60e36fc24fb 100644
    ) {
      my_error(HA_ERR_OUT_OF_MEM, MYF(0));
 diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc
-index 723beb0775e..fe628f55d16 100644
+index 83c5a37555f..5bae895570d 100644
 --- a/storage/spider/spd_table.cc
 +++ b/storage/spider/spd_table.cc
-@@ -1211,8 +1211,8 @@ int spider_create_string_list(
+@@ -1209,8 +1209,8 @@ int spider_create_string_list(
  
    if (!(*string_list = (char**)
      spider_bulk_malloc(spider_current_trx, 37, MYF(MY_WME | MY_ZEROFILL),
@@ -629,7 +629,7 @@ index 723beb0775e..fe628f55d16 100644
        NullS))
    ) {
      my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM);
-@@ -1330,7 +1330,7 @@ int spider_create_long_list(
+@@ -1328,7 +1328,7 @@ int spider_create_long_list(
  
    if (!(*long_list = (long*)
      spider_bulk_malloc(spider_current_trx, 38, MYF(MY_WME | MY_ZEROFILL),
@@ -638,7 +638,7 @@ index 723beb0775e..fe628f55d16 100644
        NullS))
    ) {
      my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM);
-@@ -1414,7 +1414,7 @@ int spider_create_longlong_list(
+@@ -1412,7 +1412,7 @@ int spider_create_longlong_list(
  
    if (!(*longlong_list = (longlong *)
      spider_bulk_malloc(spider_current_trx, 39, MYF(MY_WME | MY_ZEROFILL),
@@ -647,7 +647,7 @@ index 723beb0775e..fe628f55d16 100644
        NullS))
    ) {
      my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM);
-@@ -1485,8 +1485,8 @@ int spider_increase_string_list(
+@@ -1483,8 +1483,8 @@ int spider_increase_string_list(
  
    if (!(tmp_str_list = (char**)
      spider_bulk_malloc(spider_current_trx, 40, MYF(MY_WME | MY_ZEROFILL),
@@ -658,7 +658,7 @@ index 723beb0775e..fe628f55d16 100644
        NullS))
    ) {
      my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM);
-@@ -1548,8 +1548,8 @@ int spider_increase_null_string_list(
+@@ -1546,8 +1546,8 @@ int spider_increase_null_string_list(
  
    if (!(tmp_str_list = (char**)
      spider_bulk_malloc(spider_current_trx, 247, MYF(MY_WME | MY_ZEROFILL),
@@ -669,7 +669,7 @@ index 723beb0775e..fe628f55d16 100644
        NullS))
    ) {
      my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM);
-@@ -1606,7 +1606,7 @@ int spider_increase_long_list(
+@@ -1604,7 +1604,7 @@ int spider_increase_long_list(
  
    if (!(tmp_long_list = (long*)
      spider_bulk_malloc(spider_current_trx, 41, MYF(MY_WME | MY_ZEROFILL),
@@ -678,7 +678,7 @@ index 723beb0775e..fe628f55d16 100644
        NullS))
    ) {
      my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM);
-@@ -1651,7 +1651,7 @@ int spider_increase_longlong_list(
+@@ -1649,7 +1649,7 @@ int spider_increase_longlong_list(
  
    if (!(tmp_longlong_list = (longlong*)
      spider_bulk_malloc(spider_current_trx, 42, MYF(MY_WME | MY_ZEROFILL),
@@ -687,7 +687,7 @@ index 723beb0775e..fe628f55d16 100644
        NullS))
    ) {
      my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM);
-@@ -2974,17 +2974,17 @@ int spider_parse_connect_info(
+@@ -2972,17 +2972,17 @@ int spider_parse_connect_info(
    if (!(share_alter->tmp_server_names = (char **)
      spider_bulk_malloc(spider_current_trx, 43, MYF(MY_WME | MY_ZEROFILL),
        &share_alter->tmp_server_names,
@@ -711,7 +711,7 @@ index 723beb0775e..fe628f55d16 100644
        NullS))
    ) {
      error_num = HA_ERR_OUT_OF_MEM;
-@@ -4388,13 +4388,17 @@ SPIDER_SHARE *spider_create_share(
+@@ -4383,13 +4383,17 @@ SPIDER_SHARE *spider_create_share(
    bitmap_size = spider_bitmap_size(table_share->fields);
    if (!(share = (SPIDER_SHARE *)
      spider_bulk_malloc(spider_current_trx, 46, MYF(MY_WME | MY_ZEROFILL),
@@ -736,7 +736,7 @@ index 723beb0775e..fe628f55d16 100644
        NullS))
    ) {
      *error_num = HA_ERR_OUT_OF_MEM;
-@@ -5921,8 +5925,8 @@ SPIDER_LGTM_TBLHND_SHARE *spider_get_lgtm_tblhnd_share(
+@@ -5907,8 +5911,8 @@ SPIDER_LGTM_TBLHND_SHARE *spider_get_lgtm_tblhnd_share(
      DBUG_PRINT("info",("spider create new lgtm tblhnd share"));
      if (!(lgtm_tblhnd_share = (SPIDER_LGTM_TBLHND_SHARE *)
        spider_bulk_malloc(spider_current_trx, 244, MYF(MY_WME | MY_ZEROFILL),
@@ -747,7 +747,7 @@ index 723beb0775e..fe628f55d16 100644
          NullS))
      ) {
        *error_num = HA_ERR_OUT_OF_MEM;
-@@ -6031,9 +6035,10 @@ SPIDER_PARTITION_SHARE *spider_get_pt_share(
+@@ -6017,9 +6021,10 @@ SPIDER_PARTITION_SHARE *spider_get_pt_share(
      DBUG_PRINT("info",("spider create new pt share"));
      if (!(partition_share = (SPIDER_PARTITION_SHARE *)
        spider_bulk_malloc(spider_current_trx, 51, MYF(MY_WME | MY_ZEROFILL),
@@ -761,7 +761,7 @@ index 723beb0775e..fe628f55d16 100644
          NullS))
      ) {
        *error_num = HA_ERR_OUT_OF_MEM;
-@@ -6379,15 +6384,18 @@ int spider_open_all_tables(
+@@ -6395,15 +6400,18 @@ int spider_open_all_tables(
  
        if (!(share = (SPIDER_SHARE *)
          spider_bulk_malloc(spider_current_trx, 52, MYF(MY_WME | MY_ZEROFILL),
@@ -789,7 +789,7 @@ index 723beb0775e..fe628f55d16 100644
            NullS))
        ) {
          delete spider;
-@@ -7194,12 +7202,12 @@ int spider_db_init(
+@@ -7204,12 +7212,12 @@ int spider_db_init(
  
    if (!(spider_udf_table_mon_mutexes = (pthread_mutex_t *)
      spider_bulk_malloc(NULL, 53, MYF(MY_WME | MY_ZEROFILL),
@@ -808,7 +808,7 @@ index 723beb0775e..fe628f55d16 100644
        NullS))
    )
      goto error_alloc_mon_mutxes;
-@@ -7248,10 +7256,10 @@ int spider_db_init(
+@@ -7258,10 +7266,10 @@ int spider_db_init(
  #ifndef WITHOUT_SPIDER_BG_SEARCH
    if (!(spider_table_sts_threads = (SPIDER_THREAD *)
      spider_bulk_malloc(NULL, 256, MYF(MY_WME | MY_ZEROFILL),
@@ -823,7 +823,7 @@ index 723beb0775e..fe628f55d16 100644
        NullS))
    )
      goto error_alloc_mon_mutxes;
-@@ -7947,8 +7955,8 @@ SPIDER_INIT_ERROR_TABLE *spider_get_init_error_table(
+@@ -7968,8 +7976,8 @@ SPIDER_INIT_ERROR_TABLE *spider_get_init_error_table(
      }
      if (!(spider_init_error_table = (SPIDER_INIT_ERROR_TABLE *)
        spider_bulk_malloc(spider_current_trx, 54, MYF(MY_WME | MY_ZEROFILL),
@@ -834,7 +834,7 @@ index 723beb0775e..fe628f55d16 100644
          NullS))
      ) {
        pthread_mutex_unlock(&spider_init_error_tbl_mutex);
-@@ -9624,25 +9632,25 @@ int spider_create_spider_object_for_share(
+@@ -9551,25 +9559,25 @@ int spider_create_spider_object_for_share(
  #if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET)
    if (!(need_mons = (int *)
      spider_bulk_malloc(spider_current_trx, 255, MYF(MY_WME | MY_ZEROFILL),
@@ -875,10 +875,10 @@ index 723beb0775e..fe628f55d16 100644
    )
  #endif
 diff --git a/storage/spider/spd_trx.cc b/storage/spider/spd_trx.cc
-index 485c61fc60b..b1b31a6db2e 100644
+index bb9f11793cb..1638533eca1 100644
 --- a/storage/spider/spd_trx.cc
 +++ b/storage/spider/spd_trx.cc
-@@ -549,81 +549,90 @@ int spider_create_trx_alter_table(
+@@ -548,81 +548,90 @@ int spider_create_trx_alter_table(
  
    if (!(alter_table = (SPIDER_ALTER_TABLE *)
      spider_bulk_malloc(spider_current_trx, 55, MYF(MY_WME | MY_ZEROFILL),
@@ -1043,7 +1043,7 @@ index 485c61fc60b..b1b31a6db2e 100644
        NullS))
    ) {
      error_num = HA_ERR_OUT_OF_MEM;
-@@ -1201,10 +1210,10 @@ SPIDER_TRX *spider_get_trx(
+@@ -1200,10 +1209,10 @@ SPIDER_TRX *spider_get_trx(
      DBUG_PRINT("info",("spider create new trx"));
      if (!(trx = (SPIDER_TRX *)
        spider_bulk_malloc(NULL, 56, MYF(MY_WME | MY_ZEROFILL),
@@ -1058,7 +1058,7 @@ index 485c61fc60b..b1b31a6db2e 100644
          NullS))
      )
        goto error_alloc_trx;
-@@ -4203,10 +4212,10 @@ int spider_create_trx_ha(
+@@ -4191,10 +4200,10 @@ int spider_create_trx_ha(
    {
      if (!(trx_ha = (SPIDER_TRX_HA *)
        spider_bulk_malloc(spider_current_trx, 58, MYF(MY_WME),
@@ -1074,5 +1074,5 @@ index 485c61fc60b..b1b31a6db2e 100644
      ) {
        DBUG_RETURN(HA_ERR_OUT_OF_MEM);
 -- 
-2.17.2
+2.23.0
 
diff --git a/mariadb-ssl-cipher-tests.patch b/mariadb-ssl-cipher-tests.patch
index 3d04c4c..567e433 100644
--- a/mariadb-ssl-cipher-tests.patch
+++ b/mariadb-ssl-cipher-tests.patch
@@ -1,52 +1,13 @@
 diff -up mariadb-10.3.9/mysql-test/main/ssl_cipher.test.fixtest mariadb-10.3.9/mysql-test/main/ssl_cipher.test
---- mariadb-10.3.9/mysql-test/main/ssl_cipher.test.fixtest	2019-01-27 19:39:19.610027153 +0100
-+++ mariadb-10.3.9/mysql-test/main/ssl_cipher.test	2019-01-27 19:42:10.045430776 +0100
-@@ -13,7 +13,9 @@
+--- mariadb-10.3.13/mysql-test/main/ssl_cipher.test	2019-02-20 08:59:09.000000000 +0100
++++ mariadb-10.3.13/mysql-test/main/ssl_cipher.test_patched	2019-02-22 11:22:01.250256060 +0100
+@@ -97,7 +97,9 @@ drop user mysqltest_1@localhost;
+ let $restart_parameters=--ssl-cipher=AES128-SHA;
+ source include/restart_mysqld.inc;
  connect (ssl_con,localhost,root,,,,,SSL);
- 
- # Check Cipher Name and Cipher List
 +--replace_regex /TLS_AES_.*/AES128-SHA/
  SHOW STATUS LIKE 'Ssl_cipher';
 +--replace_regex /TLS_AES_.*/AES128-SHA/
  SHOW STATUS LIKE 'Ssl_cipher_list';
- 
- connection default;
-diff -up mariadb-10.3.9/mysql-test/main/ssl.result.fixtestssl mariadb-10.3.9/mysql-test/main/ssl.result
---- mariadb-10.3.9/mysql-test/main/ssl.result.fixtestssl	2019-01-27 20:41:52.605213547 +0100
-+++ mariadb-10.3.9/mysql-test/main/ssl.result	2019-01-27 20:42:03.977320005 +0100
-@@ -2176,7 +2176,7 @@ still connected?
- connection default;
  disconnect ssl_con;
- create user mysqltest_1@localhost;
--grant usage on mysqltest.* to mysqltest_1@localhost require cipher "AES256-SHA";
-+grant usage on mysqltest.* to mysqltest_1@localhost require cipher "TLS_AES_256_GCM_SHA384";
- Variable_name	Value
--Ssl_cipher	AES256-SHA
-+Ssl_cipher	TLS_AES_256_GCM_SHA384
- drop user mysqltest_1@localhost;
-diff -up mariadb-10.3.9/mysql-test/main/ssl.test.fixtestssl mariadb-10.3.9/mysql-test/main/ssl.test
---- mariadb-10.3.9/mysql-test/main/ssl.test.fixtestssl	2019-01-27 20:40:39.756531579 +0100
-+++ mariadb-10.3.9/mysql-test/main/ssl.test	2019-01-27 20:41:02.631745724 +0100
-@@ -33,8 +33,8 @@ connection default;
- disconnect ssl_con;
- 
- create user mysqltest_1@localhost;
--grant usage on mysqltest.* to mysqltest_1@localhost require cipher "AES256-SHA";
----exec $MYSQL -umysqltest_1 --ssl-cipher=AES256-SHA -e "show status like 'ssl_cipher'" 2>&1
-+grant usage on mysqltest.* to mysqltest_1@localhost require cipher "TLS_AES_256_GCM_SHA384";
-+--exec $MYSQL -umysqltest_1 --ssl-cipher=TLS_AES_256_GCM_SHA384 -e "show status like 'ssl_cipher'" 2>&1
- drop user mysqltest_1@localhost;
- 
- # Wait till all disconnects are completed
-diff -up mariadb-10.3.9/mysql-test/main/ssl_cert_verify.test.fixcerttest mariadb-10.3.9/mysql-test/main/ssl_cert_verify.test
---- mariadb-10.3.9/mysql-test/main/ssl_cert_verify.test.fixcerttest	2019-01-27 21:11:12.280726041 +0100
-+++ mariadb-10.3.9/mysql-test/main/ssl_cert_verify.test	2019-01-27 21:10:01.034041434 +0100
-@@ -30,7 +30,7 @@ let $ssl_verify_pass_path = --ssl --ssl-
- --enable_reconnect
- --source include/wait_until_connected_again.inc
- 
----replace_result TLSv1.2 TLS_VERSION TLSv1.1 TLS_VERSION TLSv1 TLS_VERSION
-+--replace_result TLSv1.3 TLS_VERSION TLSv1.2 TLS_VERSION TLSv1.1 TLS_VERSION TLSv1 TLS_VERSION
- --exec $MYSQL --protocol=tcp --ssl-ca=$MYSQL_TEST_DIR/std_data/ca-cert-verify.pem --ssl-verify-server-cert -e "SHOW STATUS like 'Ssl_version'"
- 
- --echo # restart server using restart
+ connection default;
diff --git a/mariadb.spec b/mariadb.spec
index 30d3975..ca6c53f 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -11,7 +11,7 @@
 # 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.4.6
+%global last_tested_version 10.4.11
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0
 
@@ -36,23 +36,17 @@
 #   Current version in MariaDB, 7.07, only supports the x86_64
 #   Mroonga upstream warns about using 32-bit package: http://mroonga.org/docs/install.html
 # RocksDB engine
-#   https://mariadb.com/kb/en/library/myrocks-supported-platforms/
-#   RocksB engine is available only for x86_64
+#   https://mariadb.com/kb/en/library/about-myrocks-for-mariadb/
+#   RocksDB engine is available only for x86_64
 #   RocksDB may be built with jemalloc, if specified in CMake
-# Cassandra engine
-#   Experimental version of the Cassandra storage engine
-#   The tests needs running cassandra server
-#   Do not build it for now
 %if %_arch == x86_64 && 0%{?fedora}
 %bcond_without tokudb
 %bcond_without mroonga
 %bcond_without rocksdb
-%bcond_with cassandra
 %else
 %bcond_with tokudb
 %bcond_with mroonga
 %bcond_with rocksdb
-%bcond_with cassandra
 %endif
 
 # The Open Query GRAPH engine (OQGRAPH) is a computation engine allowing
@@ -69,6 +63,7 @@
 %bcond_with connect
 %bcond_with sphinx
 %endif
+
 %bcond_without gssapi
 
 # For some use cases we do not need some parts of the package. Set to "...with" to exclude
@@ -85,17 +80,11 @@
 %bcond_without test
 %bcond_without galera
 %bcond_without backup
-# Upstream no longer maintain and pack the bench subpackage
-%if 0%{?fedora}
-%bcond_with bench
-%else
-%bcond_with bench
-%endif
 
 # When there is already another package that ships /etc/my.cnf,
 # rather include it than ship the file again, since conflicts between
 # those files may create issues
-%if 0%{?fedora} >= 29 || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} > 7
 %bcond_with config
 %else
 %bcond_without config
@@ -157,7 +146,7 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          10.4.11
+Version:          10.4.12
 Release:          1%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
@@ -202,10 +191,16 @@ Patch7:           %{pkgnamepatch}-scripts.patch
 Patch9:           %{pkgnamepatch}-ownsetup.patch
 #   Patch10: Fix cipher name in the SSL Cipher name test
 Patch10:          %{pkgnamepatch}-ssl-cipher-tests.patch
-#   Patch11: Workaround for "chown 0" with priviledges dropped to "mysql" user
-Patch11:          %{pkgnamepatch}-auth_pam_tool_dir.patch
+#   Patch11: Use PCDIR CMake option, if configured
+Patch11:          %{pkgnamepatch}-pcdir.patch
 #   Patch13: Fix Spider code on armv7hl; https://jira.mariadb.org/browse/MDEV-18737
 Patch13:          %{pkgnamepatch}-spider_on_armv7hl.patch
+#   Patch14: Remove the '-Werror' flag so the debug build won't crash on random warnings
+Patch14:          %{pkgnamepatch}-debug_build.patch
+#   Patch15:  Add option to edit groonga's and groonga-normalizer-mysql install path
+Patch15:          %{pkgnamepatch}-groonga.patch
+#   Patch16: Workaround for "chown 0" with priviledges dropped to "mysql" user
+Patch16:          %{pkgnamepatch}-auth_pam_tool_dir.patch
 
 BuildRequires:    cmake gcc-c++
 BuildRequires:    multilib-rpm-config
@@ -227,6 +222,8 @@ BuildRequires:    systemtap-sdt-devel
 # Bison SQL parser; needed also for wsrep API
 BuildRequires:    bison bison-devel
 
+%{?with_debug:BuildRequires:    valgrind-devel}
+
 # auth_pam.so plugin will be build if pam-devel is installed
 BuildRequires:    pam-devel
 # use either new enough version of pcre or provide bundles(pcre)
@@ -286,7 +283,7 @@ Suggests:         %{name}-server%{?_isa} = %{sameevr}
 # MySQL (with caps) is upstream's spelling of their own RPMs for mysql
 %{?with_conflicts:Conflicts:        community-mysql}
 
-# Filtering: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering
+# Filtering: https://docs.fedoraproject.org/en-US/packaging-guidelines/AutoProvidesAndRequiresFiltering/
 %global __requires_exclude ^perl\\((hostnames|lib::mtr|lib::v1|mtr_|My::)
 %global __provides_exclude_from ^(%{_datadir}/(mysql|mysql-test)/.*|%{_libdir}/%{pkg_name}/plugin/.*\\.so)$
 
@@ -308,14 +305,14 @@ Requires:         %{name}-common%{?_isa} = %{sameevr}
 %if %{with mysql_names}
 Provides:         mysql-libs = %{sameevr}
 Provides:         mysql-libs%{?_isa} = %{sameevr}
-%endif # mysql_names
+%endif
 
 %description      libs
 The mariadb-libs package provides the essential shared libraries for any
 MariaDB/MySQL client program or interface. You will need to install this
 package to use any other MariaDB package or any clients that need to connect
 to a MariaDB/MySQL server.
-%endif #clibrary
+%endif
 
 
 # At least main config file /etc/my.cnf is shared for client and server part
@@ -344,6 +341,7 @@ package itself.
 Summary:          The shared files required by server and client
 Requires:         %{_sysconfdir}/my.cnf
 
+
 %if %{without clibrary}
 Obsoletes: %{name}-libs <= %{sameevr}
 %endif
@@ -410,7 +408,6 @@ Recommends:       %{name}-backup%{?_isa} = %{sameevr}
 %{?with_sphinx:Suggests:       %{name}-sphinx-engine%{?_isa} = %{sameevr}}
 %{?with_oqgraph:Suggests:      %{name}-oqgraph-engine%{?_isa} = %{sameevr}}
 %{?with_connect:Suggests:      %{name}-connect-engine%{?_isa} = %{sameevr}}
-%{?with_cassandra:Suggests:    %{name}-cassandra-engine%{?_isa} = %{sameevr}}
 
 Suggests:         mytop
 Suggests:         logrotate
@@ -443,6 +440,9 @@ Provides:         mysql-compat-server%{?_isa} = %{sameevr}
 %endif
 %{?with_conflicts:Conflicts:        community-mysql-server}
 
+# Bench subpackage has been deprecated in F32
+Obsoletes: %{name}-bench <= %{sameevr}
+
 %description      server
 MariaDB is a multi-user, multi-threaded SQL database server. It is a
 client/server implementation consisting of a server daemon (mysqld)
@@ -559,16 +559,6 @@ Requires:         sphinx libsphinxclient
 The Sphinx storage engine for MariaDB.
 %endif
 
-%if %{with cassandra}
-%package          cassandra-engine
-Summary:          The Cassandra storage engine for MariaDB - EXPERIMENTAL VERSION
-Requires:         %{name}-server%{?_isa} = %{sameevr}
-BuildRequires:    cassandra thrift-devel
-
-%description      cassandra-engine
-The Cassandra storage engine for MariaDB. EXPERIMENTAL VERSION!
-%endif
-
 
 %package          server-utils
 Summary:          Non-essential server utilities for MariaDB/MySQL applications
@@ -588,10 +578,9 @@ the only MariaDB sub-package, except test subpackage, that depends on Perl.
 %if %{with devel}
 %package          devel
 Summary:          Files for development of MariaDB/MySQL applications
+%{?with_clibrary:Requires:         %{name}-libs%{?_isa} = %{sameevr}}
 Requires:         openssl-devel
-%if %{with clibrary}
-Requires:         %{name}-libs%{?_isa} = %{sameevr}
-%else
+%if %{without clibrary}
 Requires:         mariadb-connector-c-devel >= 3.0
 %endif
 %if %{with mysql_names}
@@ -651,24 +640,6 @@ the embedded version of the MariaDB server.
 %endif
 
 
-%if %{with bench}
-%package          bench
-Summary:          MariaDB benchmark scripts and data
-Requires:         %{name}%{?_isa} = %{sameevr}
-%if %{with mysql_names}
-Provides:         mysql-bench = %{sameevr}
-Provides:         mysql-bench%{?_isa} = %{sameevr}
-%endif
-%{?with_conflicts:Conflicts:        community-mysql-bench}
-
-%description      bench
-MariaDB is a multi-user, multi-threaded SQL database server.
-MariaDB is a community developed branch of MySQL.
-This package contains benchmark scripts and data for use when benchmarking
-MariaDB.
-%endif
-
-
 %if %{with test}
 %package          test
 Summary:          The test suite distributed with MariaDB
@@ -710,9 +681,12 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \;
 %patch4 -p1
 %patch7 -p1
 %patch9 -p1
-#%patch10 -p1
+%patch10 -p1
 %patch11 -p1
 %patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 # workaround for upstream bug #56342
 #rm mysql-test/t/ssl_8k_key-master.opt
@@ -761,7 +735,7 @@ if [ "$pcre_system_version" != "$pcre_maj.$pcre_min" ]
 then
   echo "\n Warning: Error: Bundled PCRE version is not correct. \n\tSystem version number:$pcre_system_version \n\tUpstream version number: $pcre_maj.$pcre_min\n"
 fi
-%endif # PCRE
+%endif
 
 
 %if %{without rocksdb}
@@ -774,6 +748,7 @@ rm -r storage/tokudb/mysql-test/tokudb/t/*.py
 
 
 %build
+%{set_build_flags}
 
 # fail quickly and obviously if user tries to build as root
 %if %runselftest
@@ -789,18 +764,17 @@ CFLAGS="$CFLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
 # force PIC mode so that we can build libmysqld.so
 CFLAGS="$CFLAGS -fPIC"
 
-# Override all optimization flags when making a debug build
 %if %{with debug}
-CFLAGS="$CFLAGS -O0 -g
-CPPFLAGS="$CPPFLAGS -O0 -g -D_FORTIFY_SOURCE=0
+# Override all optimization flags when making a debug build
+CFLAGS="$CFLAGS -O0 -g"
+CPPFLAGS="$CPPFLAGS -O0 -g -D_FORTIFY_SOURCE=0"
 # Fix GCC flags broken by MariaDB upstream
-CFLAGS="$CFLAGS      -Wno-error=deprecated-copy -Wno-error=pessimizing-move -Wno-error=unused-result -Wno-error=maybe-uninitialized -Wno-error=stringop-overflow -Wno-error=sign-compare
-CXXFLAGS="$CFLAGS"
-CPPFLAGS="$CPPFLAGS  -Wno-error=deprecated-copy -Wno-error=pessimizing-move -Wno-error=unused-result -Wno-error=maybe-uninitialized -Wno-error=stringop-overflow -Wno-error=sign-compare
+CFLAGS="$CFLAGS      -Wno-error=deprecated-copy -Wno-error=pessimizing-move -Wno-error=unused-result -Wno-error=maybe-uninitialized -Wno-error=stringop-overflow -Wno-error=sign-compare"
+CPPFLAGS="$CPPFLAGS  -Wno-error=deprecated-copy -Wno-error=pessimizing-move -Wno-error=unused-result -Wno-error=maybe-uninitialized -Wno-error=stringop-overflow -Wno-error=sign-compare"
 %endif
 
-
-
+CXXFLAGS="$CFLAGS"
+CPPFLAGS="$CFLAGS"
 export CFLAGS CXXFLAGS CPPFLAGS
 
 
@@ -830,12 +804,13 @@ export CFLAGS CXXFLAGS CPPFLAGS
          -DINSTALL_PLUGINDIR="%{_lib}/%{pkg_name}/plugin" \
          -DINSTALL_SBINDIR=libexec \
          -DINSTALL_SCRIPTDIR=bin \
-         -DINSTALL_SQLBENCHDIR=share \
          -DINSTALL_SUPPORTFILESDIR=share/%{pkg_name} \
          -DINSTALL_PCDIR=%{_lib}/pkgconfig \
          -DMYSQL_DATADIR="%{dbdatadir}" \
          -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
          -DTMPDIR=/var/tmp \
+         -DGRN_DATA_DIR=share/%{name}-server/groonga \
+         -DGROONGA_NORMALIZER_MYSQL_PROJECT_NAME=%{name}-server/groonga-normalizer-mysql \
          -DENABLED_LOCAL_INFILE=ON \
          -DENABLE_DTRACE=ON \
          -DSECURITY_HARDENED=ON \
@@ -859,7 +834,6 @@ export CFLAGS CXXFLAGS CPPFLAGS
          -DPLUGIN_SPHINX=%{?with_sphinx:DYNAMIC}%{!?with_sphinx:NO} \
          -DPLUGIN_TOKUDB=%{?with_tokudb:DYNAMIC}%{!?with_tokudb:NO} \
          -DPLUGIN_CONNECT=%{?with_connect:DYNAMIC}%{!?with_connect:NO} \
-         -DWITH_CASSANDRA=%{?with_cassandra:TRUE}%{!?with_cassandra:FALSE} \
          -DPLUGIN_CLIENT_ED25519=OFF \
          -DPYTHON_SHEBANG=%{python_path} \
          -DPLUGIN_CACHING_SHA2_PASSWORD=%{?with_clibrary:DYNAMIC}%{!?with_clibrary:OFF} \
@@ -872,7 +846,7 @@ export CFLAGS CXXFLAGS CPPFLAGS
 # cmake ./ -LAH for List Advanced Help
 cmake ./ -L
 
-make %{?_smp_mflags} VERBOSE=1
+%make_build VERBOSE=1
 
 
 # build selinux policy
@@ -882,7 +856,7 @@ make -f /usr/share/selinux/devel/Makefile %{name}-server-galera.pp
 %endif
 
 %install
-make DESTDIR=%{buildroot} install
+%make_install
 
 # multilib header support #1625157
 for header in mysql/server/my_config.h mysql/server/private/config.h; do
@@ -901,11 +875,6 @@ install -p -m 0755 scripts/mysql_config_multilib %{buildroot}%{_bindir}/mysql_co
 ln -s mysql_config.1 %{buildroot}%{_mandir}/man1/mysql_config-%{__isa_bits}.1
 fi
 
-# Upstream install this into arch-independent directory
-# Reported to upstream as: https://jira.mariadb.org/browse/MDEV-14340
-# TODO: check, if it changes location inside that file depending on values passed to Cmake
-mkdir -p %{buildroot}/%{_libdir}/pkgconfig
-mv %{buildroot}/%{_datadir}/pkgconfig/*.pc %{buildroot}/%{_libdir}/pkgconfig
 %if %{without clibrary}
 # Client part should be included in package 'mariadb-connector-c'
 rm %{buildroot}%{_libdir}/pkgconfig/libmariadb.pc
@@ -915,6 +884,7 @@ rm %{buildroot}%{_libdir}/pkgconfig/libmariadb.pc
 # but that's pretty wacko --- see also %%{name}-file-contents.patch)
 install -p -m 644 Docs/INFO_SRC %{buildroot}%{_libdir}/%{pkg_name}/
 install -p -m 644 Docs/INFO_BIN %{buildroot}%{_libdir}/%{pkg_name}/
+rm -r %{buildroot}%{_datadir}/doc/%{_pkgdocdirname}/MariaDB-server-%{version}/
 
 # Logfile creation
 mkdir -p %{buildroot}%{logfiledir}
@@ -939,7 +909,7 @@ mv %{buildroot}%{_sysconfdir}/my.cnf.d/server.cnf %{buildroot}%{_sysconfdir}/my.
 # Rename sysusers and tmpfiles config files, they should be named after the software they belong to
 mv %{buildroot}%{_sysusersdir}/sysusers.conf %{buildroot}%{_sysusersdir}/%{name}.conf
 
-# remove SysV init script and a symlink to that, we pack our very own
+# remove SysV init script and a symlink to that, we use systemd
 rm %{buildroot}%{_libexecdir}/rcmysql
 # install systemd unit files and scripts for handling server startup
 install -D -p -m 644 scripts/mysql.service %{buildroot}%{_unitdir}/%{daemon_name}.service
@@ -950,7 +920,7 @@ rm %{buildroot}%{_tmpfilesdir}/tmpfiles.conf
 install -D -p -m 0644 scripts/mysql.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{name}.conf
 %if 0%{?mysqld_pid_dir:1}
 echo "d %{pidfiledir} 0755 mysql mysql -" >>%{buildroot}%{_tmpfilesdir}/%{name}.conf
-%endif #pid
+%endif
 
 # helper scripts for service starting
 install -p -m 755 scripts/mysql-prepare-db-dir %{buildroot}%{_libexecdir}/mysql-prepare-db-dir
@@ -974,8 +944,7 @@ ln -s unstable-tests %{buildroot}%{_datadir}/mysql-test/rh-skipped-tests.list
 
 # Client that uses libmysqld embedded server.
 # Pretty much like normal mysql command line client, but it doesn't require a running mariadb server.
-%{?with_embedded:rm %{buildroot}%{_bindir}/mysql_embedded}
-%{?with_embedded:rm %{buildroot}%{_bindir}/mariadb-embedded}
+%{?with_embedded:rm %{buildroot}%{_bindir}/{mariadb-,mysql_}embedded}
 rm %{buildroot}%{_mandir}/man1/{mysql_,mariadb-}embedded.1*
 # Static libraries
 rm %{buildroot}%{_libdir}/*.a
@@ -994,7 +963,7 @@ rm %{buildroot}%{_datadir}/%{pkg_name}/mysql.server
 rm %{buildroot}%{_datadir}/%{pkg_name}/mysqld_multi.server
 
 # Binary for monitoring MySQL performance
-# Shipped as a standalona package in Fedora
+# Shipped as a standalone package in Fedora
 rm %{buildroot}%{_bindir}/mytop
 
 # put logrotate script where it needs to be
@@ -1024,8 +993,7 @@ rm %{buildroot}%{logrotateddir}/mysql
 # Remove AppArmor files
 rm -r %{buildroot}%{_datadir}/%{pkg_name}/policy/apparmor
 
-# script without shebang: https://jira.mariadb.org/browse/MDEV-14266
-chmod -x %{buildroot}%{_datadir}/sql-bench/myisam.cnf
+mv %{buildroot}/lib/security %{buildroot}%{_libdir}
 
 # Disable plugins
 %if %{with gssapi}
@@ -1035,6 +1003,13 @@ sed -i 's/^plugin-load-add/#plugin-load-add/' %{buildroot}%{_sysconfdir}/my.cnf.
 sed -i 's/^plugin-load-add/#plugin-load-add/' %{buildroot}%{_sysconfdir}/my.cnf.d/cracklib_password_check.cnf
 %endif
 
+# Fix Galera Replication config file
+#   The replication requires cluster address upon startup (which is end-user specific).
+#   Disable it entirely, rather than have it failing out-of-the-box.
+%if %{with galera}
+sed -i 's/^wsrep_on=1/wsrep_on=0/' %{buildroot}%{_sysconfdir}/my.cnf.d/galera.cnf
+%endif
+
 %if %{without embedded}
 rm %{buildroot}%{_mandir}/man1/{mysql_client_test_embedded,mysqltest_embedded}.1*
 rm %{buildroot}%{_mandir}/man1/{mariadb-client-test-embedded,mariadb-test-embedded}.1*
@@ -1078,8 +1053,8 @@ rm %{buildroot}%{_libdir}/pkgconfig/mariadb.pc
 rm %{buildroot}%{_libdir}/libmariadb*.so
 unlink %{buildroot}%{_libdir}/libmysqlclient.so
 unlink %{buildroot}%{_libdir}/libmysqlclient_r.so
-%endif # clibrary
-%endif # devel
+%endif
+%endif
 
 %if %{without client}
 rm %{buildroot}%{_bindir}/msql2mysql
@@ -1091,8 +1066,6 @@ rm %{buildroot}%{_mandir}/man1/msql2mysql.1*
 rm %{buildroot}%{_mandir}/man1/{mysql,mariadb}.1*
 rm %{buildroot}%{_mandir}/man1/mysql{access,admin,binlog,check,dump,_find_rows,import,_plugin,show,slap,_waitpid}.1*
 rm %{buildroot}%{_mandir}/man1/mariadb-{access,admin,binlog,check,dump,find-rows,import,plugin,show,slap,waitpid}.1*
-
-rm %{buildroot}%{_sysconfdir}/my.cnf.d/mysql-clients.cnf
 %endif
 
 %if %{without tokudb}
@@ -1101,9 +1074,9 @@ rm %{buildroot}%{_mandir}/man1/tokuftdump.1*
 rm %{buildroot}%{_mandir}/man1/tokuft_logprint.1*
 %else
 %if 0%{?fedora} || 0%{?rhel} > 7
-rm -f %{buildroot}/etc/systemd/system/mariadb.service.d/tokudb.conf
+# Move the upstream file to the correct location
 mkdir -p %{buildroot}%{_unitdir}/mariadb.service.d
-echo -e '[Service]\nEnvironment="LD_PRELOAD=%{_libdir}/libjemalloc.so.2"' >> %{buildroot}%{_unitdir}/mariadb.service.d/tokudb.conf
+mv %{buildroot}/etc/systemd/system/mariadb.service.d/tokudb.conf %{buildroot}%{_unitdir}/mariadb.service.d/tokudb.conf
 %endif
 %endif
 
@@ -1115,10 +1088,6 @@ rm %{buildroot}%{_sysconfdir}/my.cnf
 rm -r %{buildroot}%{_datadir}/%{pkg_name}/charsets
 %endif
 
-%if %{without gssapi}
-#rm -r %{buildroot}/etc/my.cnf.d/auth_gssapi.cnf
-%endif
-
 %if %{without errmsg}
 rm %{buildroot}%{_datadir}/%{pkg_name}/errmsg-utf8.txt
 rm -r %{buildroot}%{_datadir}/%{pkg_name}/{english,czech,danish,dutch,estonian,\
@@ -1126,10 +1095,6 @@ french,german,greek,hungarian,italian,japanese,korean,norwegian,norwegian-ny,\
 polish,portuguese,romanian,russian,serbian,slovak,spanish,swedish,ukrainian,hindi}
 %endif
 
-%if %{without bench}
-rm -r %{buildroot}%{_datadir}/sql-bench
-%endif
-
 %if %{without test}
 %if %{with embedded}
 rm %{buildroot}%{_bindir}/{mysql_client_test_embedded,mysqltest_embedded}
@@ -1143,10 +1108,10 @@ rm %{buildroot}%{_bindir}/{mariadb-client-test,mariadb-test}
 rm %{buildroot}%{_mandir}/man1/{mysql_client_test,mysqltest,my_safe_process}.1*
 rm %{buildroot}%{_mandir}/man1/{mariadb-client-test,mariadb-test}.1*
 rm %{buildroot}%{_mandir}/man1/{mysql-test-run,mysql-stress-test}.pl.1*
-%endif # test
+%endif
 
 %if %{without galera}
-#rm %{buildroot}%{_sysconfdir}/my.cnf.d/galera.cnf
+rm %{buildroot}%{_sysconfdir}/my.cnf.d/galera.cnf
 rm %{buildroot}%{_sysconfdir}/sysconfig/clustercheck
 rm %{buildroot}%{_bindir}/{clustercheck,galera_new_cluster}
 rm %{buildroot}%{_bindir}/galera_recovery
@@ -1185,7 +1150,7 @@ export MTR_BUILD_THREAD=%{__isa_bits}
   set -ex
   cd mysql-test
 
-  export common_testsuite_arguments=" --parallel=auto --force --retry=1 --suite-timeout=900 --testcase-timeout=30 --mysqld=--binlog-format=mixed --force-restart --shutdown-timeout=60 --max-test-fail=5 "
+  export common_testsuite_arguments=" --parallel=auto --force --retry=2 --suite-timeout=900 --testcase-timeout=30 --mysqld=--binlog-format=mixed --force-restart --shutdown-timeout=60 --max-test-fail=5 "
 
   # If full testsuite has already been run on this version and we don't explicitly want the full testsuite to be run
   if [[ "%{last_tested_version}" == "%{version}" ]] && [[ %{force_run_testsuite} -eq 0 ]]
@@ -1206,7 +1171,7 @@ export MTR_BUILD_THREAD=%{__isa_bits}
       --skip-test-list=unstable-tests
     %endif
     # Second run for the SPIDER suites that fail with SCA (ssl self signed certificate)
-    perl ./mysql-test-run.pl $common_testsuite_arguments --skip-ssl --big-test --mem --suite=spider,spider/bg \
+    perl ./mysql-test-run.pl $common_testsuite_arguments --skip-ssl --big-test --mem --suite=spider,spider/bg,spider/bugfix,spider/handler \
     %if %{ignore_testsuite_result}
       --max-test-fail=999 || :
     %endif
@@ -1214,8 +1179,11 @@ export MTR_BUILD_THREAD=%{__isa_bits}
   fi
 )
 
-%endif # if dry run
-%endif # with test
+# NOTE: the Spider SE has 2 more hidden testsuites "oracle" and "oracle2".
+#       however, all of the tests fail with: "failed: 12521: Can't use wrapper 'oracle' for SQL connection"
+
+%endif
+%endif
 
 
 
@@ -1270,17 +1238,14 @@ fi
 %{_mandir}/man1/mariadb-{access,admin,binlog,check,dump,find-rows,import,plugin,show,slap,waitpid}.1*
 
 %config(noreplace) %{_sysconfdir}/my.cnf.d/mysql-clients.cnf
-
 %endif
 
 %if %{with clibrary}
 %files libs
-%if %{with clibrary}
 %exclude %{_libdir}/{libmysqlclient.so.18,libmariadb.so,libmysqlclient.so,libmysqlclient_r.so}
 %{_libdir}/libmariadb.so*
 %config(noreplace) %{_sysconfdir}/my.cnf.d/client.cnf
 %endif
-%endif
 
 %if %{with config}
 %files config
@@ -1298,8 +1263,8 @@ fi
 %if %{with clibrary}
 %{_libdir}/%{pkg_name}/plugin/dialog.so
 %{_libdir}/%{pkg_name}/plugin/mysql_clear_password.so
-%endif # clibrary
-%endif # common
+%endif
+%endif
 
 %if %{with errmsg}
 %files errmsg
@@ -1380,6 +1345,8 @@ fi
 %dir %{_libdir}/%{pkg_name}/plugin
 # Change from root:root to mysql:mysql, so it can be accessed by the server
 %attr(0755,mysql,mysql) %dir %{_libdir}/%{pkg_name}/plugin/auth_pam_tool_dir
+%{_libdir}/security/pam_user_map.so
+%{_sysconfdir}/security/user_map.conf
 %{_libdir}/%{pkg_name}/plugin/*
 %{?with_oqgraph:%exclude %{_libdir}/%{pkg_name}/plugin/ha_oqgraph.so}
 %{?with_connect:%exclude %{_libdir}/%{pkg_name}/plugin/ha_connect.so}
@@ -1388,7 +1355,6 @@ fi
 %{?with_tokudb:%exclude %{_libdir}/%{pkg_name}/plugin/ha_tokudb.so}
 %{?with_gssapi:%exclude %{_libdir}/%{pkg_name}/plugin/auth_gssapi.so}
 %{?with_sphinx:%exclude %{_libdir}/%{pkg_name}/plugin/ha_sphinx.so}
-%{?with_cassandra:%exclude %{_libdir}/%{pkg_name}/plugin/ha_cassandra.so}
 %if %{with clibrary}
 %exclude %{_libdir}/%{pkg_name}/plugin/dialog.so
 %exclude %{_libdir}/%{pkg_name}/plugin/mysql_clear_password.so
@@ -1403,10 +1369,11 @@ fi
 %{_mandir}/man1/myisampack.1*
 %{_mandir}/man1/myisam_ftdump.1*
 %{_mandir}/man1/my_print_defaults.1*
-%{_mandir}/man1/mysql.server.1*
+
 %{_mandir}/man1/mysql_{install_db,secure_installation,tzinfo_to_sql}.1*
 %{_mandir}/man1/mariadb-{install-db,secure-installation,tzinfo-to-sql}.1*
 %{_mandir}/man1/{mysqld_,mariadbd-}safe.1*
+
 %{_mandir}/man1/innochecksum.1*
 %{_mandir}/man1/replace.1*
 %{_mandir}/man1/resolveip.1*
@@ -1414,6 +1381,8 @@ fi
 %{_mandir}/man8/{mysqld,mariadbd}.8*
 %{_mandir}/man1/wsrep_*.1*
 
+%{_mandir}/man1/mysql.server.1*
+
 %{_datadir}/%{pkg_name}/fill_help_tables.sql
 %{_datadir}/%{pkg_name}/install_spider.sql
 %{_datadir}/%{pkg_name}/maria_add_gis_sp.sql
@@ -1429,10 +1398,10 @@ fi
 %{_datadir}/%{pkg_name}/mroonga/uninstall.sql
 %license %{_datadir}/%{pkg_name}/mroonga/COPYING
 %license %{_datadir}/%{pkg_name}/mroonga/AUTHORS
-%license %{_datadir}/groonga-normalizer-mysql/lgpl-2.0.txt
-%license %{_datadir}/groonga/COPYING
-%doc %{_datadir}/groonga-normalizer-mysql/README.md
-%doc %{_datadir}/groonga/README.md
+%license %{_datadir}/%{name}-server/groonga-normalizer-mysql/lgpl-2.0.txt
+%license %{_datadir}/%{name}-server/groonga/COPYING
+%doc %{_datadir}/%{name}-server/groonga-normalizer-mysql/README.md
+%doc %{_datadir}/%{name}-server/groonga/README.md
 %endif
 %if %{with galera}
 %{_datadir}/%{pkg_name}/wsrep.cnf
@@ -1526,12 +1495,6 @@ fi
 %{_libdir}/%{pkg_name}/plugin/ha_connect.so
 %endif
 
-%if %{with cassandra}
-%files cassandra-engine
-%config(noreplace) %{_sysconfdir}/my.cnf.d/cassandra.cnf
-%{_libdir}/%{pkg_name}/plugin/ha_cassandra.so
-%endif
-
 %files server-utils
 # Perl utilities
 %{_bindir}/mysql{_convert_table_format,dumpslow,_fix_extensions,hotcopy,_setpermission}
@@ -1576,12 +1539,6 @@ fi
 %{_libdir}/libmariadbd.so
 %endif
 
-%if %{with bench}
-%files bench
-%{_datadir}/sql-bench
-%doc %{_datadir}/sql-bench/README
-%endif
-
 %if %{with test}
 %files test
 %if %{with embedded}
@@ -1594,6 +1551,7 @@ fi
 %{_bindir}/{mysql_client_test,mysqltest,mariadb-client-test,mariadb-test}
 %{_bindir}/my_safe_process
 %attr(-,mysql,mysql) %{_datadir}/mysql-test
+%{_mandir}/man1/mysql_client_test.1*
 %{_mandir}/man1/{mysql_client_test,mysqltest,mariadb-client-test,mariadb-test}.1*
 %{_mandir}/man1/my_safe_process.1*
 %{_mandir}/man1/mysql-stress-test.pl.1*
@@ -1601,39 +1559,67 @@ fi
 %endif
 
 %changelog
-* Fri Jan 10 2020 Michal Schorm <mschorm@redhat.com> - 10.4.11-1
+* Thu Feb 06 2020 Michal Schorm <mschorm@redhat.com> - 10.4.12-1
+- Rebase to 10.4.12
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3:10.4.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jan 17 2020 Michal Schorm <mschorm@redhat.com> - 10.4.11-1
 - Rebase to 10.4.11
+  Related: #1756468
+- Remove 'bench' subpackage. Upstream no longer maintains it.
+- Use Valgrind for debug builds
+- Remove ancient obsoletions
+- Tweak build flags
+- Add patch for auth_pam_tool directory
 
+* Fri Jan 10 2020 Michal Schorm <mschorm@redhat.com> - 10.3.21-1
+- Rebase to 10.3.21
 
-* Tue Dec 03 2019 Michal Schorm <mschorm@redhat.com> - 3:10.4.10-1
-- Rebase to 10.4.10
-  Upstream started linking the Galera libraries statically
+* Mon Nov 18 2019 Lukas Javorsky <ljavorsk@redhat.com> - 10.3.20-3
+- Change path of groonga's packaged files
+- Fix bz#1763287
 
-* Wed Sep 25 2019 Michal Schorm <mschorm@redhat.com> - 3:10.4.7-2
+* Tue Nov 12 2019 Michal Schorm <mschorm@redhat.com> - 10.3.20-2
+- Rebuild on top fo new mariadb-connector-c
+
+* Mon Nov 11 2019 Michal Schorm <mschorm@redhat.com> - 10.3.20-1
+- Rebase to 10.3.20
+
+* Wed Nov 06 2019 Michal Schorm <mschorm@redhat.com> - 10.3.19-1
+- Rebase to 10.3.19
+
+* Thu Oct 31 2019 Carl George <carl@george.computer> - 3:10.3.18-1
+- Rebase to 10.3.18
+
+* Wed Sep 11 2019 Michal Schorm <mschorm@redhat.com> - 10.3.17-3
 - Disable building of the ed25519 client plugin.
   From now on it will be shipped by 'mariadb-connector-c' package
-- Disable building of bench subpackage. Upstream no longer maintain it
 
-* Thu Aug 22 2019 Michal Schorm <mschorm@redhat.com> - 3:10.4.7-1
-- Rebase to 10.4.7
+* Fri Sep 06 2019 Michal Schorm <mschorm@redhat.com> - 10.3.17-2
+- Fix the debug build
 
-* Fri Jun 21 2019 Michal Schorm <mschorm@redhat.com> - 3:10.4.6-2
-- Apply critical patch for Spider SE on Armv7hl architecture
+* Thu Aug 01 2019 Michal Schorm <mschorm@redhat.com> - 10.3.17-1
+- Rebase to 10.3.17
 
-* Thu Jun 20 2019 Michal Schorm <mschorm@redhat.com> - 3:10.4.6-1
-- Rebase to 10.4.6
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3:10.3.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
-* Fri Jun 07 2019 Michal Schorm <mschorm@redhat.com> - 3:10.4.5-1
-- Rebase to 10.4.5
-- This is a RC release! use with caution
+* Tue Jun 18 2019 Michal Schorm <mschorm@redhat.com> - 10.3.16-1
+- Rebase to 10.3.16
+- Added patch for armv7hl builds of spider SE
 
-* Tue Jun 04 2019 Michal Schorm <mschorm@redhat.com> - 3:10.3.15-1
+* Tue Jun 11 2019 Michal Schorm <mschorm@redhat.com> - 10.3.15-1
 - Rebase to 10.3.15
 - CVEs fixed:
   CVE-2019-2510 CVE-2019-2537
 - CVEs fixed:
   CVE-2019-2614 CVE-2019-2627 CVE-2019-2628
 
+* Tue Jun 11 2019 Michal Schorm <mschorm@redhat.com> - 10.3.12-15
+- Remove Cassandra subpackage; it is no longer developed
+
 * Thu Mar 21 2019 Michal Schorm <mschorm@redhat.com> - 10.3.12-14
 - Fix building of TokuDB with Jemalloc 5
 - Fix building with / without lz4
diff --git a/rh-skipped-tests-arm.list b/rh-skipped-tests-arm.list
index b05d1a8..ec37d1b 100644
--- a/rh-skipped-tests-arm.list
+++ b/rh-skipped-tests-arm.list
@@ -1,37 +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.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 :
+# Fails since 10.3.17, only on armv7hl
+versioning.partition      :
diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list
index b982197..2b101f5 100644
--- a/rh-skipped-tests-base.list
+++ b/rh-skipped-tests-base.list
@@ -1,13 +1,8 @@
 # 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                              :
-
-# 
-perfschema.nesting                           : #1399847
-perfschema.socket_summary_by_instance_func   : #1399847
-perfschema.socket_summary_by_event_name_func :
+main.ssl_crl                                 : #1399847
 
 # ------------------------------
 # Tests that fails because of 'Self Signed Certificate in the Certificate Chain'
@@ -19,45 +14,26 @@ 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                  :
 
-# 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                     :
-
-# Fails on ppc and arm since 10.2.15
-innodb_gis.rtree_compress2                   :
-parts.partition_alter4_innodb                :
-
-# Fails from 10.3.9
-encryption.innodb-redo-badkey                :
-
-# Expected: Plugin building disabled in server
-plugins.auth_ed25519                         :
-
-# Fails from 10.4.10
+# Fails everywhere since 10.4.11
+main.events_bugs                             :
 sys_vars.tcp_nodelay                         :
-# only on i686
-main.key_cache                               :
-parts.optimizer                              :
-main.opt_trace_index_merge                   :
+
+# Fails on i686
+encryption.innodb-redo-badkey                :
diff --git a/rh-skipped-tests-ppc.list b/rh-skipped-tests-ppc.list
index dd5050c..ceff217 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 on ppc64le since 10.4.12
+oqgraph.social : 
diff --git a/rh-skipped-tests-s390.list b/rh-skipped-tests-s390.list
index 00a20ae..a7573da 100644
--- a/rh-skipped-tests-s390.list
+++ b/rh-skipped-tests-s390.list
@@ -1,9 +1,4 @@
 # 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.4.11
+disks.disks_notembedded        :
diff --git a/sources b/sources
index dfbf8f0..e1aa5e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mariadb-10.4.11.tar.gz) = 2a1a8d90e326530b41a8a7d6889325cefcba5914451a48c6a20d5d5cd68004835e76e6ecac628554167a014f9c0b1487c15f37151afd771ea0166a4c40afd7d2
+SHA512 (mariadb-10.4.12.tar.gz) = 518dae18c04a1f7fcc6fd4d2dfbfbfbdf5e83e72ca41e66e1074328df8d92ab41b458e6a9973771419ac09a7348f264f158916cd198c335085d6e823e707bbc6