Rebase to 8.4.6

Upstream release notes:
https://dev.mysql.com/doc/relnotes/mysql/8.4/en/news-8-4-6.html

Related: RHEL-104250

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 $_ }

mysql8.4.spec

@@ -2,7 +2,7 @@ ExcludeArch: %{ix86}
 
 # Name of the package without any prefixes
 %global majorname mysql
-%global package_version 8.4.5
+%global package_version 8.4.6
 %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.5
+%global last_tested_version 8.4.6
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0
 
@@ -1137,6 +1137,9 @@ fi
 %endif
 
 %changelog
+* 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
 

sources

@@ -1 +1 @@
-SHA512 (mysql-8.4.5.tar.gz) = d5353bbc618fb6ec3658773d834942f5bfd11f6f5d3fb4778aa684b970a6143d5e96919ba2311bfb00faf3882da307c62b9370aca8f41136ec129d5fa06bcf5c
+SHA512 (mysql-8.4.6.tar.gz) = 2d498dc71eeede4368bd70fb1d1c012abd774732e341312f469afa3823c3b37489032b3290fa7531fb78c2b36251dbd1b8e1554c9330e18e56407f96fb8d4a1e