Add riscv64 support

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,3 +1 @@
-/*/
-/*.rpm
-/*.tar.gz
+mysql-8.4.9.tar.gz

README.mysql-license

@@ -3,7 +3,10 @@ that allow the client libraries to be linked with a non-GPL application,
 so long as the application is under a license approved by Oracle.
 For details see
 
-http://www.mysql.com/about/legal/licensing/foss-exception/
+'The Universal FOSS Exception, Version 1.0':
+  https://oss.oracle.com/licenses/universal-foss-exception/
+A predecessor of that license exception is now deprecated 'FOSS License Exception':
+  http://www.mysql.com/about/legal/licensing/foss-exception/
 
 Some innobase code from Percona and Google is under BSD license.
 Some code related to test-suite is under LGPLv2.

boost-1.58.0-pool.patch

@@ -1,120 +0,0 @@
-Index: boost/pool/pool.hpp
-===================================================================
---- boost/pool/pool.hpp	(revision 78317)
-+++ boost/pool/pool.hpp	(revision 78326)
-@@ -27,4 +27,6 @@
- #include <boost/pool/poolfwd.hpp>
- 
-+// std::numeric_limits
-+#include <boost/limits.hpp>
- // boost::integer::static_lcm
- #include <boost/integer/common_factor_ct.hpp>
-@@ -358,4 +360,11 @@
-     }
- 
-+    size_type max_chunks() const
-+    { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool.
-+      size_type partition_size = alloc_size();
-+      size_type POD_size = integer::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
-+      return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
-+    }
-+
-     static void * & nextof(void * const ptr)
-     { //! \returns Pointer dereferenced.
-@@ -377,5 +388,7 @@
-       //!   the first time that object needs to allocate system memory.
-       //!   The default is 32. This parameter may not be 0.
--      //! \param nmax_size is the maximum number of chunks to allocate in one block.
-+      //! \param nmax_size is the maximum number of chunks to allocate in one block.			
-+      set_next_size(nnext_size);
-+      set_max_size(nmax_size);
-     }
- 
-@@ -400,7 +413,7 @@
-     }
-     void set_next_size(const size_type nnext_size)
--    { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.
--      //! \returns nnext_size.
--      next_size = start_size = nnext_size;
-+    { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.     
-+      BOOST_USING_STD_MIN();
-+      next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks());
-     }
-     size_type get_max_size() const
-@@ -410,5 +423,6 @@
-     void set_max_size(const size_type nmax_size)
-     { //! Set max_size.
--      max_size = nmax_size;
-+      BOOST_USING_STD_MIN();
-+      max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks());
-     }
-     size_type get_requested_size() const
-@@ -713,7 +727,7 @@
-   BOOST_USING_STD_MIN();
-   if(!max_size)
--    next_size <<= 1;
-+    set_next_size(next_size << 1);
-   else if( next_size*partition_size/requested_size < max_size)
--    next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
-+    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
- 
-   //  initialize it,
-@@ -753,7 +767,7 @@
-   BOOST_USING_STD_MIN();
-   if(!max_size)
--    next_size <<= 1;
-+    set_next_size(next_size << 1);
-   else if( next_size*partition_size/requested_size < max_size)
--    next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
-+    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
- 
-   //  initialize it,
-@@ -797,4 +811,6 @@
-   //! \returns Address of chunk n if allocated ok.
-   //! \returns 0 if not enough memory for n chunks.
-+  if (n > max_chunks())
-+    return 0;
- 
-   const size_type partition_size = alloc_size();
-@@ -845,7 +861,7 @@
-   BOOST_USING_STD_MIN();
-   if(!max_size)
--    next_size <<= 1;
-+    set_next_size(next_size << 1);
-   else if( next_size*partition_size/requested_size < max_size)
--    next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
-+    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
- 
-   //  insert it into the list,
-Index: libs/pool/test/test_bug_6701.cpp
-===================================================================
---- libs/pool/test/test_bug_6701.cpp	(revision 78326)
-+++ libs/pool/test/test_bug_6701.cpp	(revision 78326)
-@@ -0,0 +1,27 @@
-+/* Copyright (C) 2012 Étienne Dupuis
-+* 
-+* Use, modification and distribution is subject to the 
-+* Boost Software License, Version 1.0. (See accompanying
-+* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
-+*/
-+
-+// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701)
-+
-+#include <boost/pool/object_pool.hpp>
-+#include <boost/limits.hpp>
-+
-+int main()
-+{
-+  boost::pool<> p(1024, std::numeric_limits<size_t>::max() / 768);
-+
-+  void *x = p.malloc();
-+  BOOST_ASSERT(!x);
-+  
-+  BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_next_size());
-+  BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_max_size());
-+
-+  void *y = p.ordered_malloc(std::numeric_limits<size_t>::max() / 768);
-+  BOOST_ASSERT(!y);
-+
-+  return 0;
-+}

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

mysql-openssl-engine.patch

@@ -1,15 +0,0 @@
-https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine
-https://fedoraproject.org/wiki/Changes/OpensslNoEngine
-
---- mysql-8.4.0/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc	2024-04-10 08:26:28.000000000 +0200
-+++ mysql-8.4.0/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc_patched	2024-07-18 18:33:26.237771364 +0200
-@@ -50,7 +50,9 @@
- #include "my_compiler.h"
- #endif
- 
-+#if !defined(OPENSSL_NO_ENGINE)
- #include "openssl/engine.h"
-+#endif
- 
- #include "xcom/retry.h"
- #include "xcom/task_debug.h"

mysql-paths.patch

@@ -3,32 +3,21 @@ Software Collections. Removing these hard-coded paths should fix it.
 
 Upstream report: https://mariadb.atlassian.net/browse/MDEV-6485
 
-diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
-index 9f7945d8..6734cdfd 100644
---- a/cmake/install_layout.cmake
-+++ b/cmake/install_layout.cmake
-@@ -105,7 +105,7 @@ IF(UNIX)
-     " Choose between ${VALID_INSTALL_LAYOUTS}" )
-   ENDIF()
- 
--  SET(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc"
-+  SET(SYSCONFDIR "/etc"
-     CACHE PATH "config directory (for my.cnf)")
-   MARK_AS_ADVANCED(SYSCONFDIR)
+diff -Naur mysql-8.4.6/cmake/install_layout.cmake mysql-8.4.6_patched/cmake/install_layout.cmake
+--- mysql-8.4.6/cmake/install_layout.cmake	2025-07-10 16:20:26.000000000 +0200
++++ mysql-8.4.6_patched/cmake/install_layout.cmake	2025-07-23 09:50:42.278223154 +0200
+@@ -202,6 +202,7 @@
+ ELSE()
+   SET(INSTALL_SBINDIR_RPM                 "sbin")
  ENDIF()
-@@ -189,6 +189,7 @@ SET(INSTALL_SECURE_FILE_PRIVDIR_TARGZ ${secure_file_priv_path})
- #
- SET(INSTALL_BINDIR_RPM                  "bin")
- SET(INSTALL_SBINDIR_RPM                 "sbin")
 +SET(INSTALL_SYSCONFDIR_RPM              "/etc")
  #
  IF(CMAKE_SYSTEM_PROCESSOR IN_LIST KNOWN_64BIT_ARCHITECTURES)
    SET(INSTALL_LIBDIR_RPM                "lib64/mysql")
-diff --git a/mysys/my_default.cc b/mysys/my_default.cc
-index 290f1666..8403425f 100644
---- a/mysys/my_default.cc
-+++ b/mysys/my_default.cc
-@@ -1570,12 +1570,12 @@ static const char **init_default_directories(MEM_ROOT *alloc) {
+diff -Naur mysql-8.4.6/mysys/my_default.cc mysql-8.4.6_patched/mysys/my_default.cc
+--- mysql-8.4.6/mysys/my_default.cc	2025-07-10 16:20:26.000000000 +0200
++++ mysql-8.4.6_patched/mysys/my_default.cc	2025-07-23 09:52:21.494414633 +0200
+@@ -1693,12 +1693,12 @@
  
  #else
  
@@ -44,11 +33,10 @@ index 290f1666..8403425f 100644
  #endif /* DEFAULT_SYSCONFDIR */
  
  #endif
-diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
-index 4149a764..b091d5e2 100644
---- a/scripts/CMakeLists.txt
-+++ b/scripts/CMakeLists.txt
-@@ -288,9 +288,9 @@ IF(UNIX)
+diff -Naur mysql-8.4.6/scripts/CMakeLists.txt mysql-8.4.6_patched/scripts/CMakeLists.txt
+--- mysql-8.4.6/scripts/CMakeLists.txt	2025-07-10 16:20:26.000000000 +0200
++++ mysql-8.4.6_patched/scripts/CMakeLists.txt	2025-07-23 09:53:30.114124746 +0200
+@@ -331,9 +331,9 @@
  ENDIF(UNIX)
  
  SET(prefix "${CMAKE_INSTALL_PREFIX}")
@@ -60,11 +48,10 @@ index 4149a764..b091d5e2 100644
  SET(datadir ${prefix}/${INSTALL_MYSQLSHAREDIR})
  SET(libsubdir  ${INSTALL_LIBDIR})
  SET(pkgincludedir ${prefix}/${INSTALL_INCLUDEDIR})
-diff --git a/scripts/mysqld_multi.pl.in b/scripts/mysqld_multi.pl.in
-index 84dd4d7c..50397ddd 100644
---- a/scripts/mysqld_multi.pl.in
-+++ b/scripts/mysqld_multi.pl.in
-@@ -586,9 +586,7 @@ sub list_defaults_files
+diff -Naur mysql-8.4.6/scripts/mysqld_multi.pl.in mysql-8.4.6_patched/scripts/mysqld_multi.pl.in
+--- mysql-8.4.6/scripts/mysqld_multi.pl.in	2025-07-10 16:20:26.000000000 +0200
++++ mysql-8.4.6_patched/scripts/mysqld_multi.pl.in	2025-07-23 09:54:16.090991270 +0200
+@@ -587,9 +587,7 @@
  
    my %seen;  # Don't list the same file more than once
    return grep { defined $_ and not $seen{$_}++ and -f $_ and -r $_ }

mysql.tmpfiles.d.in

@@ -1 +1,8 @@
 d @PID_FILE_DIR@ 0755 mysql mysql -
+
+# Rules for ephemeral file systems (ImageMode)
+d /var/lib/mysql 0755 mysql mysql -
+d /var/log/mysql 0750 mysql mysql -
+f /var/log/mysql/mysql.log 0640 mysql mysql -
+d /var/lib/mysql-files 0750 mysql mysql -
+d /var/lib/mysql-keyring 0700 mysql mysql -

mysql8.4.spec

@@ -2,8 +2,8 @@ ExcludeArch: %{ix86}
 
 # Name of the package without any prefixes
 %global majorname mysql
-%global package_version 8.4.4
-%define majorversion %(echo %{package_version} | cut -d'.' -f1-2 )
+%global package_version 8.4.9
+%global majorversion %(echo %{package_version} | cut -d'.' -f1-2 )
 %global pkgnamepatch mysql
 
 
@@ -21,7 +21,7 @@ ExcludeArch: %{ix86}
 # 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 8.4.4
+%global last_tested_version 8.4.9
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0
 
@@ -104,13 +104,13 @@ ExcludeArch: %{ix86}
 
 Name:             %{majorname}%{majorversion}
 Version:          %{package_version}
-Release:          2%{?with_debug:.debug}%{?dist}
+Release:          1%{?with_debug:.debug}%{?dist}.alma.1
 Summary:          MySQL client programs and shared libraries
 URL:              http://www.mysql.com
 
-# Exceptions allow client libraries to be linked with most open source SW,
-# not only GPL code.  See README.mysql-license
-License:          GPL-2.0-or-later AND LGPL-2.1-only AND BSL-1.0 AND BSD-2-Clause
+# The the `Universal-FOSS-exception-1.0` exception allow client libraries to be linked with most open source SW, not only GPL code.
+# Usage of the `Universal-FOSS-exception-1.0` in the SPDX license expression does not signify that we regard "Interfaces" as protected by copyright.
+License:          GPL-2.0-only AND ( GPL-2.0-only WITH Universal-FOSS-exception-1.0 ) AND GPL-2.0-or-later AND ( LGPL-2.0-only WITH Universal-FOSS-exception-1.0 ) AND ( GPL-3.0-or-later WITH Bison-exception-2.2 ) AND ( GPL-2.0-only OR BSD-2-Clause ) AND BSD-2-Clause AND BSL-1.0 AND Apache-2.0 AND MIT
 
 Source0:          https://cdn.mysql.com/Downloads/MySQL-8.4/mysql-%{version}.tar.gz
 Source2:          mysql_config_multilib.sh
@@ -145,7 +145,6 @@ Patch5:           %{pkgnamepatch}-paths.patch
 Patch51:          %{pkgnamepatch}-sharedir.patch
 Patch52:          %{pkgnamepatch}-rpath.patch
 Patch56:          %{pkgnamepatch}-flush-logrotate.patch
-Patch57:          %{pkgnamepatch}-openssl-engine.patch
 
 # Patches taken from boost 1.59
 Patch112:         boost-1.57.0-mpl-print.patch
@@ -170,16 +169,12 @@ BuildRequires:    mecab-devel
 BuildRequires:    bison
 BuildRequires:    libzstd-devel
 BuildRequires:    libcurl-devel
-%ifnarch aarch64 s390x
+%ifnarch aarch64 s390x riscv64
 BuildRequires:    numactl-devel
 BuildRequires:    libquadmath-devel
 %endif
 BuildRequires:    openssl
 BuildRequires:    openssl-devel
-%if 0%{?fedora} >= 41
-# Complement of mysql-openssl-engine.patch
-BuildRequires:    openssl-devel-engine
-%endif
 
 BuildRequires:    perl-interpreter
 BuildRequires:    perl-generators
@@ -256,9 +251,9 @@ Provides:         bundled(rapidjson)
 # https://github.com/martinus/unordered_dense
 Provides:         bundled(unordered_dense)
 
-%{?with_conflicts_mariadb:Conflicts: mariadb}
+%{?with_conflicts_mariadb:Conflicts: mariadb-any}
 # Explicitly disallow installation of mysql + mariadb-server
-%{?with_conflicts_mariadb:Conflicts: mariadb-server}
+%{?with_conflicts_mariadb:Conflicts: mariadb-server-any}
 %{?with_provides_community_mysql:Provides: community-mysql = %community_mysql_version}
 %{?with_provides_community_mysql:Provides: community-mysql%{?_isa} = %community_mysql_version}
 %{?with_obsoletes_community_mysql:Obsoletes: community-mysql <= %obsolete_community_mysql_version}
@@ -270,20 +265,32 @@ Conflicts: %{majorname}%{?1:-%{1}}-any\
 
 # Provide also mysqlX.X if default
 %if %?mysql_default
-%define mysqlX_if_default() %{expand:\
+%define mysqlX_if_default_arched() %{expand:\
+Obsoletes: mysql%{?1:-%{1}} < %{sameevr}\
+Obsoletes: mysql%{majorversion}%{?1:-%{1}} < %{sameevr}\
 Provides: mysql%{majorversion}%{?1:-%{1}} = %{sameevr}\
 Provides: mysql%{majorversion}%{?1:-%{1}}%{?_isa} = %{sameevr}\
 }
+%define mysqlX_if_default_noarch() %{expand:\
+Obsoletes: mysql%{?1:-%{1}} < %{sameevr}\
+Obsoletes: mysql%{majorversion}%{?1:-%{1}} < %{sameevr}\
+Provides: mysql%{majorversion}%{?1:-%{1}} = %{sameevr}\
+}
 %else
-%define mysqlX_if_default() %{nil}
+%define mysqlX_if_default_arched() %{nil}
+%define mysqlX_if_default_noarch() %{nil}
 %endif
 
-%define add_metadata() %{expand:\
+%define add_metadata_arched() %{expand:\
 %conflict_with_other_streams %{**}\
-%mysqlX_if_default %{**}\
+%mysqlX_if_default_arched %{**}\
+}
+%define add_metadata_noarch() %{expand:\
+%conflict_with_other_streams %{**}\
+%mysqlX_if_default_noarch %{**}\
 }
 
-%add_metadata
+%add_metadata_arched
 
 %description
 MySQL is a multi-user, multi-threaded SQL database server. MySQL is a
@@ -307,7 +314,7 @@ Requires:         %{pkgname}-common = %{sameevr}
 %{?with_provides_community_mysql:Provides: community-mysql-libs%{?_isa}= %community_mysql_version}
 %{?with_obsoletes_community_mysql:Obsoletes: community-mysql-libs <= %obsolete_community_mysql_version}
 
-%add_metadata libs
+%add_metadata_arched libs
 
 %description      -n %{pkgname}-libs
 The mysql-libs package provides the essential shared libraries for any
@@ -324,7 +331,7 @@ Summary:          The config files required by server and client
 %{?with_provides_community_mysql:Provides: community-mysql-config%{?_isa} = %community_mysql_version}
 %{?with_obsoletes_community_mysql:Obsoletes: community-mysql-config <= %obsolete_community_mysql_version}
 
-%add_metadata config
+%add_metadata_arched config
 
 %description      -n %{pkgname}-config
 The package provides the config file my.cnf and my.cnf.d directory used by any
@@ -347,7 +354,7 @@ Requires:         %{_sysconfdir}/my.cnf
 %{?with_obsoletes_community_mysql:Obsoletes: community-mysql-common <= %obsolete_community_mysql_version}
 
 # As this package is noarch, it can't use the %%{?_isa} RPM macro
-%conflict_with_other_streams common
+%add_metadata_noarch common
 
 %description      -n %{pkgname}-common
 The mysql-common package provides the essential shared files for any
@@ -365,7 +372,7 @@ Requires:         %{pkgname}-common = %{sameevr}
 %{?with_obsoletes_community_mysql:Obsoletes: community-mysql-errmsg <= %obsolete_community_mysql_version}
 
 # As this package is noarch, it can't use the %%{?_isa} RPM macro
-%conflict_with_other_streams errmsg
+%add_metadata_noarch errmsg
 
 %description      -n %{pkgname}-errmsg
 The package provides error messages files for the MySQL daemon
@@ -405,16 +412,16 @@ Requires:         (mysql-selinux if selinux-policy-targeted)
 
 Suggests:         logrotate
 
-%{?with_conflicts_mariadb:Conflicts: mariadb-server}
-%{?with_conflicts_mariadb:Conflicts: mariadb-server-utils}
-%{?with_conflicts_mariadb:Conflicts: mariadb-server-galera}
+%{?with_conflicts_mariadb:Conflicts: mariadb-server-any}
+%{?with_conflicts_mariadb:Conflicts: mariadb-server-utils-any}
+%{?with_conflicts_mariadb:Conflicts: mariadb-server-galera-any}
 # Explicitly disallow installation of mysql + mariadb-server
-%{?with_conflicts_mariadb:Conflicts: mariadb}
+%{?with_conflicts_mariadb:Conflicts: mariadb-any}
 %{?with_provides_community_mysql:Provides: community-mysql-server = %community_mysql_version}
 %{?with_provides_community_mysql:Provides: community-mysql-server%{?_isa} = %community_mysql_version}
 %{?with_obsoletes_community_mysql:Obsoletes: community-mysql-server <= %obsolete_community_mysql_version}
 
-%add_metadata server
+%add_metadata_arched server
 
 %description      -n %{pkgname}-server
 MySQL is a multi-user, multi-threaded SQL database server. MySQL is a
@@ -430,13 +437,13 @@ Summary:          Files for development of MySQL applications
 Requires:         openssl-devel
 Requires:         zlib-devel
 Requires:         libzstd-devel
-%{?with_conflicts_mariadb:Conflicts: mariadb-devel}
+%{?with_conflicts_mariadb:Conflicts: mariadb-devel-any}
 %{?with_conflicts_mariadb:Conflicts: mariadb-connector-c-devel}
 %{?with_provides_community_mysql:Provides: community-mysql-devel = %community_mysql_version}
 %{?with_provides_community_mysql:Provides: community-mysql-devel%{?_isa} = %community_mysql_version}
 %{?with_obsoletes_community_mysql:Obsoletes: community-mysql-devel <= %obsolete_community_mysql_version}
 
-%add_metadata devel
+%add_metadata_arched devel
 
 %description      -n %{pkgname}-devel
 MySQL is a multi-user, multi-threaded SQL database server. This
@@ -473,12 +480,12 @@ Requires:         perl(Test::More)
 Requires:         perl(Time::HiRes)
 Requires:         perl(File::Compare)
 
-%{?with_conflicts_mariadb:Conflicts: mariadb-test}
+%{?with_conflicts_mariadb:Conflicts: mariadb-test-any}
 %{?with_provides_community_mysql:Provides: community-mysql-test = %community_mysql_version}
 %{?with_provides_community_mysql:Provides: community-mysql-test%{?_isa} = %community_mysql_version}
 %{?with_obsoletes_community_mysql:Obsoletes: community-mysql-test <= %obsolete_community_mysql_version}
 
-%add_metadata test
+%add_metadata_arched test
 
 %description      -n %{pkgname}-test
 MySQL is a multi-user, multi-threaded SQL database server. This
@@ -491,7 +498,7 @@ BuildArch:        noarch
 Requires:         %{pkgname}-test = %{sameevr}
 
 # As this package is noarch, it can't use the %%{?_isa} RPM macro
-%conflict_with_other_streams test-data
+%add_metadata_noarch test-data
 
 %description      -n %{pkgname}-test-data
 MySQL is a multi-user, multi-threaded SQL database server. This
@@ -509,7 +516,6 @@ regression test suite distributed with the MySQL sources.
 %patch -P51 -p1
 %patch -P52 -p1
 %patch -P56 -p1
-%patch -P57 -p1
 
 # Patch Boost
 pushd extra/boost/boost_$(echo %{boost_bundled_version}| tr . _)
@@ -599,10 +605,10 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
          -DSYSTEMD_SERVICE_NAME="%{daemon_name}" \
          -DSYSTEMD_PID_DIR="%{pidfiledir}" \
          -DWITH_INNODB_MEMCACHED=ON \
-%ifnarch aarch64 s390x
+%ifnarch aarch64 s390x riscv64
          -DWITH_NUMA=ON \
 %endif
-%ifarch s390x
+%ifarch s390x riscv64
          -DUSE_LD_GOLD=OFF \
 %endif
          -DWITH_ROUTER=OFF \
@@ -668,6 +674,13 @@ install -D -p -m 644 %{_vpath_builddir}/scripts/mysql@.service %{buildroot}%{_un
 install -D -p -m 0644 %{_vpath_builddir}/scripts/mysql.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{daemon_name}.conf
 rm -r %{buildroot}%{_tmpfilesdir}/mysql.conf
 
+# Create a sysusers.d config file
+# We no longer enforce the hardcoded UID/GID 27
+mkdir -p %{buildroot}%{_sysusersdir}
+cat > %{buildroot}%{_sysusersdir}/%{name}.conf << EOF
+u mysql 27 'MariaDB and MySQL Server' %{dbdatadir} -
+EOF
+
 # helper scripts for service starting
 install -D -p -m 755 %{_vpath_builddir}/scripts/mysql-prepare-db-dir %{buildroot}%{_libexecdir}/mysql-prepare-db-dir
 install -p -m 755 %{_vpath_builddir}/scripts/mysql-wait-stop %{buildroot}%{_libexecdir}/mysql-wait-stop
@@ -722,11 +735,11 @@ rm %{buildroot}%{_mandir}/man1/mysql_config.1*
 
 %if ! %{with client}
 rm %{buildroot}%{_bindir}/{mysql,mysql_config_editor,\
-mysql_plugin,mysqladmin,mysqlbinlog,\
-mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap,my_print_defaults}
+mysqladmin,mysqlbinlog,\
+mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
 rm %{buildroot}%{_mandir}/man1/{mysql,mysql_config_editor,\
-mysql_plugin,mysqladmin,mysqlbinlog,\
-mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap,my_print_defaults}.1*
+mysqladmin,mysqlbinlog,\
+mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1*
 %endif
 
 %if %{with config}
@@ -812,9 +825,6 @@ popd
 
 %post -n %{pkgname}-server
 %systemd_post %{daemon_name}.service
-if [ ! -e "%{logfile}" -a ! -h "%{logfile}" ] ; then
-    install /dev/null -m0640 -omysql -gmysql "%{logfile}"
-fi
 
 %preun -n %{pkgname}-server
 %systemd_preun %{daemon_name}.service
@@ -990,12 +1000,15 @@ fi
 %{_libexecdir}/mysql-scripts-common
 
 %{_tmpfilesdir}/%{daemon_name}.conf
+%{_sysusersdir}/%{name}.conf
+
+# Remember to also update the mysql.tmpfiles.d.in file when updating these permissions
 %attr(0755,mysql,mysql) %dir %{dbdatadir}
 %attr(0750,mysql,mysql) %dir %{_localstatedir}/lib/mysql-files
 %attr(0700,mysql,mysql) %dir %{_localstatedir}/lib/mysql-keyring
 %attr(0755,mysql,mysql) %dir %{pidfiledir}
 %attr(0750,mysql,mysql) %dir %{logfiledir}
-%attr(0640,mysql,mysql) %config %ghost %verify(not md5 size mtime) %{logfile}
+
 %config(noreplace) %{logrotateddir}/%{daemon_name}
 
 %if %{with devel}
@@ -1060,6 +1073,8 @@ fi
 %{_libdir}/mysql/plugin/component_test_sensitive_system_variables.so
 %{_libdir}/mysql/plugin/component_test_server_telemetry_metrics.so
 %{_libdir}/mysql/plugin/component_test_server_telemetry_traces.so
+%{_libdir}/mysql/plugin/component_test_server_telemetry_logs_client.so
+%{_libdir}/mysql/plugin/component_test_server_telemetry_logs_export.so
 %{_libdir}/mysql/plugin/component_test_status_var_reader.so
 %{_libdir}/mysql/plugin/component_test_status_var_service_int.so
 %{_libdir}/mysql/plugin/component_test_status_var_service_reg_only.so
@@ -1131,6 +1146,31 @@ fi
 %endif
 
 %changelog
+* Tue May 26 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 8.4.9-1.alma.1
+- Add riscv64 support
+
+* Wed May 06 2026 Michal Schorm <mschorm@redhat.com> - 8.4.9-1
+- Rebase to 8.4.9
+
+* Tue Feb 24 2026 Lukas Javorsky <ljavorsk@redhat.com> - 8.4.8-2
+- Revert to soft static allocation of MariaDB and MySQL sysusers.d files
+
+* Fri Jan 23 2026 Michal Schorm <mschorm@redhat.com> - 8.4.8-1
+- Rebase to 8.4.8
+
+* Tue Dec 09 2025 Veronika Doubkova <vdoubkov@redhat.com> - 8.4.7-2
+- Skip tests that are failing on Konflux 
+- Resolves: ROK-831
+
+* Thu Oct 30 2025 Pavol Sloboda <psloboda@redhat.com> - 8.4.7-1
+- Rebase to 8.4.7
+
+* Thu Jul 24 2025 Pavol Sloboda <psloboda@redhat.com> - 8.4.6-1
+- Rebase to 8.4.6
+
+* Mon Apr 28 2025 Pavol Sloboda <psloboda@redhat.com> - 8.4.5-1
+- Rebase to 8.4.5
+
 * Fri Feb 14 2025 Michal Schorm <mschorm@redhat.com> - 8.4.4-2
 - Rebuilt
 

plans/tier1-internal.fmf

@@ -1,10 +0,0 @@
-summary: Internal Tier1 tests plan
-discover:
-    how: fmf
-    filter: 'tier: 1'
-    url: https://pkgs.devel.redhat.com/git/tests/mysql
-execute:
-    how: tmt
-adjust:
-    enabled: false
-    when: distro == centos-stream or distro == fedora

rh-skipped-tests-list-base.list

@@ -32,3 +32,17 @@ main.subquery_sj_mat_bka_nobnl             : BUG#0
 gis.spatial_analysis_functions_centroid    : BUG#0
 perfschema.transaction_nested_events       : BUG#0
 rpl_gtid.rpl_perfschema_applier_status_by_worker_gtid_skipped_transaction_mts  : BUG#0
+
+# Failing on Konflux
+main.basedir                               : BUG#0
+main.grant_user_lock                       : BUG#0
+main.loaddata_special                      : BUG#0
+
+# Failing since 8.4.9 on RHEL 10 Konflux but passing in C10S
+auth_sec.atomic_rename_user                : BUG#0
+connection_control.performance_schema_processlist  : BUG#0
+perfschema.threads_innodb                  : BUG#0
+perfschema.system_events_component         : BUG#0
+perfschema.system_events_plugin            : BUG#0
+perfschema.threads_innodb                  : BUG#0
+sys_vars.myisam_data_pointer_size_func     : BUG#0

rh-skipped-tests-list-s390.list

@@ -11,3 +11,25 @@ test_services.test_event_tracking_consumer  : BUG#0
 
 # Fails since MySQL 8.4.4
 perfschema.threads_innodb : BUG#0
+
+# Fails since 8.0.46 / 8.4.9 / 9.7.0 on s390x
+# Bug#39129182 tightened InnoDB row size estimation in get_field_max_size().
+# Combined with zlib-ng DFLTCC compressBound() overhead on s390x,
+# compressed tables with small KEY_BLOCK_SIZE exceed row size limits.
+innodb.zlob_geom                            : BUG#0
+innodb_zip.4k                               : BUG#0
+innodb_zip.8k                               : BUG#0
+innodb_zip.bug52745                         : BUG#0
+innodb_zip.index_large_prefix               : BUG#0
+innodb_zip.index_large_prefix_4k            : BUG#0
+innodb_zip.index_large_prefix_8k            : BUG#0
+innodb_zip.prefix_index_liftedlimit         : BUG#0
+
+# Failing on both C10S and RHEL 10 Konflux since 8.4.9
+perfschema.error_log                        : BUG#0
+
+# Failing since 8.4.9 on RHEL 10 Konflux but passing in C10S
+innodb_fts.optimize_big                     : BUG#0
+rpl.rpl_parallel_ddl_innodb                 : BUG#0
+rpl.rpl_parallel_ddl_myisam                 : BUG#0
+rpl.rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config  : BUG#0

rpminspect.yaml

@@ -1,13 +0,0 @@
-# Set up global ignore list
-ignore:
-    # mysql-test/ directory contains an extensive test-suite of about 20.000 files;
-    # It is very time consuming to be fully analysed and the results aren't useful anyway
-    # It is expected the tests change during rebases, as the underlying functionality the test evolve
-    # Some of the tests contain broken or problematic code, however that is on purpose
-    - /usr/share/mysql-test/
-
-badfuncs:
-  ignore:
-    # udf_example.so can be ignored, as it is an example of how to write loadable functions
-    # Loadable functions were formerly know as UDF (User Defined Functions).
-    - /usr/lib64/mysql/plugin/udf_example.so

sources

@@ -1 +1 @@
-SHA512 (mysql-8.4.4.tar.gz) = 21f4d8162f57f63a589e3e5e140f89a8cc61f4c55a77dce4601e76192eb3d3fbeaf3bfb78f91345c517ad36bf4267f33202693cfc24812841c517a24fffcfd12
+SHA512 (mysql-8.4.9.tar.gz) = bae8aba6ba921f96799063f6c10f9f02030276f802e74a8b80f2df34e56b0d4501a1c9a9f818529cb70ec700a8f11aedf7fa645fa5db8550f51291759e6a25ad