import UBI mysql-8.0.46-1.el9_8

.gitignore

@@ -1 +1 @@
-SOURCES/mysql-boost-8.0.45.tar.gz
+SOURCES/mysql-boost-8.0.46.tar.gz

.mysql.metadata

@@ -1 +1 @@
-7717b8f6814072160cac2cb3b836045c5ef2ca7f SOURCES/mysql-boost-8.0.45.tar.gz
+5371ffebb8921f00392f98b0b301550e9853b61e SOURCES/mysql-boost-8.0.46.tar.gz

SOURCES/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 -

SOURCES/rh-skipped-tests-list-base.list

@@ -41,3 +41,9 @@ main.time_zone				   : BUG#0
 rpl.rpl_tlsv13                             : BUG#0
 auth_sec.wl15800_ciphers_tlsv13            : BUG#0
 rpl.rpl_replica_terminology                : BUG#0 # unstable
+
+# Failing since MySQL 8.0.46
+auth_sec.atomic_rename_user                : BUG#0
+main.grant_user_lock                       : BUG#0
+main.loaddata_special                      : BUG#0
+x.resource_groups                          : BUG#0

SPECS/mysql.spec

@@ -16,7 +16,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.0.45
+%global last_tested_version 8.0.46
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0
 # Aditional SELinux rules
@@ -77,7 +77,7 @@ ExcludeArch: %{ix86}
 %global sameevr   %{?epoch:%{epoch}:}%{version}-%{release}
 
 Name:             mysql
-Version:          8.0.45
+Version:          8.0.46
 Release:          1%{?with_debug:.debug}%{?dist}
 Summary:          MySQL client programs and shared libraries
 URL:              http://www.mysql.com
@@ -535,6 +535,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
@@ -860,11 +867,15 @@ popd
 %{_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}
+
 %config(noreplace) %{logrotateddir}/%{daemon_name}
 
 %if %{with devel}
@@ -982,6 +993,12 @@ popd
 %endif
 
 %changelog
+* Wed Apr 22 2026 Michal Schorm <mschorm@redhat.com> - 8.0.46-1
+- Rebase to 8.0.46
+
+* Tue Feb 24 2026 Lukas Javorsky <ljavorsk@redhat.com> - 8.0.45-2
+- Revert to soft static allocation of MariaDB and MySQL sysusers.d files
+
 * Fri Jan 23 2026 Michal Schorm <mschorm@redhat.com> - 8.0.45-1
 - Rebase to 8.0.45