rpms/mysql
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Import from CS git

Browse Source
This commit is contained in:
eabdullin 2025-09-30 11:34:23 +00:00
parent e7e15e4d2d
commit 9f64a0954d
6 changed files with 58 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/mysql-boost-8.0.41.tar.gz SOURCES/mysql-boost-8.0.43.tar.gz

2
.mysql.metadata
View File

@ -1 +1 @@
7950b1494deb5fbabed8bf0ff09b2d38cac77066 SOURCES/mysql-boost-8.0.41.tar.gz ed63879171850c7a7677b01623fcae9766741e53 SOURCES/mysql-boost-8.0.43.tar.gz

42
SOURCES/mysql-paths.patch
View File

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

14
SOURCES/rh-skipped-tests-list-base.list
View File

@ -44,3 +44,17 @@ main.archive_plugin : BUG#0
main.blackhole_plugin : BUG#0 main.blackhole_plugin : BUG#0
main.events_read_only : BUG#0 main.events_read_only : BUG#0
main.log_backtrace : BUG#0 main.log_backtrace : BUG#0
# Failing since MySQL 8.0.43
rpl_gtid.rpl_perfschema_applier_status_by_worker_gtid_skipped_transaction_mts : BUG#0 # unstable
rpl.rpl_eventlog_psi_memory : BUG#0 # unstable
perfschema.idx_threads : BUG#0 # unstable
rpl.rpl_priv_checks_user_start_info : BUG#0 # unstable
rpl_nogtid.rpl_partition_create_select : BUG#0 # unstable
perfschema.threads_mysql : BUG#0 # unstable
sysschema.pr_ps_setup_show_enabled : BUG#0 # unstable
rpl_gtid.rpl_semi_sync_observe_commit_only : BUG#0 # unstable
clone.remote_dml_auto_tune : BUG#0 # unstable
sys_vars.myisam_data_pointer_size_func : BUG#0 # unstable
main.mysql_client_test : BUG#0 # unstable
innodb_undo.undo_settings : BUG#0 # unstable

13
SOURCES/rh-skipped-tests-list-s390.list
View File

@ -7,3 +7,16 @@ main.subquery_sj_all_bka_nobnl : BUG#0
# Fails since 8.0.41 # Fails since 8.0.41
main.archive : BUG#0 main.archive : BUG#0
main.func_compress : BUG#0 main.func_compress : BUG#0
# Fails since 8.0.43
innodb.check_ibd_filesize_16k : BUG#0
innodb.innodb : BUG#0
innodb_zip.4k : BUG#0
innodb_zip.8k : BUG#0
innodb_zip.bug52745 : BUG#0
innodb_zip.bug53591 : 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
innodb.zlob_geom : BUG#0

16
SPECS/mysql.spec
View File

@ -19,7 +19,7 @@ ExcludeArch: %{ix86}
# The last version on which the full testsuite has been run # 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 # In case of further rebuilds of that version, don't require full testsuite to be run
# run only "main" suite # run only "main" suite
%global last_tested_version 8.0.41 %global last_tested_version 8.0.43
# Set to 1 to force run the testsuite even if it was already tested in current version # Set to 1 to force run the testsuite even if it was already tested in current version
%global force_run_testsuite 0 %global force_run_testsuite 0
@ -86,7 +86,7 @@ ExcludeArch: %{ix86}
%bcond_with bundled_zstd %bcond_with bundled_zstd
%bcond_with bundled_fido2 %bcond_with bundled_fido2
%endif %endif
%global zstd_bundled_version 1.5.5 %global zstd_bundled_version 1.5.7
%global libevent_bundled_version 2.1.11 %global libevent_bundled_version 2.1.11
%global fido2_bundled_version 1.15.0 %global fido2_bundled_version 1.15.0
@ -147,7 +147,7 @@ ExcludeArch: %{ix86}
%endif %endif
Name: %{?scl_prefix}mysql Name: %{?scl_prefix}mysql
Version: 8.0.41 Version: 8.0.43
Release: 1%{?with_debug:.debug}%{?dist} Release: 1%{?with_debug:.debug}%{?dist}
Summary: MySQL client programs and shared libraries Summary: MySQL client programs and shared libraries
URL: http://www.mysql.com URL: http://www.mysql.com
@ -971,9 +971,6 @@ if [ $1 = 1 ]; then
/sbin/chkconfig --add %{daemon_name} /sbin/chkconfig --add %{daemon_name}
fi fi
%endif %endif
if [ ! -e "%{logfile}" -a ! -h "%{logfile}" ] ; then
install /dev/null -m0640 -omysql -gmysql "%{logfile}"
fi
# TODO: remove after selinux-policy is fixed (BZ#1602153) # TODO: remove after selinux-policy is fixed (BZ#1602153)
semanage fcontext -a -t mysqld_log_t '/var/log/mysql(/.*)?' semanage fcontext -a -t mysqld_log_t '/var/log/mysql(/.*)?'
restorecon -r %{logfiledir} restorecon -r %{logfiledir}
@ -1169,7 +1166,6 @@ fi
%attr(0700,mysql,mysql) %dir %{_localstatedir}/lib/mysql-keyring %attr(0700,mysql,mysql) %dir %{_localstatedir}/lib/mysql-keyring
%attr(0755,mysql,mysql) %dir %{pidfiledir} %attr(0755,mysql,mysql) %dir %{pidfiledir}
%attr(0750,mysql,mysql) %dir %{logfiledir} %attr(0750,mysql,mysql) %dir %{logfiledir}
%attr(0640,mysql,mysql) %config %ghost %verify(not md5 size mtime) %{logfile}
%config(noreplace) %{logrotateddir}/%{daemon_name} %config(noreplace) %{logrotateddir}/%{daemon_name}
%{?scl:%config(noreplace) %{?_scl_scripts}/service-environment} %{?scl:%config(noreplace) %{?_scl_scripts}/service-environment}
@ -1210,6 +1206,12 @@ fi
%endif %endif
%changelog %changelog
* Wed Aug 06 2025 Pavol Sloboda <psloboda@redhat.com> - 8.0.43-1
- Rebase to MySQL 8.0.43
* Thu Apr 24 2025 Pavol Sloboda <psloboda@redhat.com> - 8.0.42-1
- Rebase to MySQL 8.0.42
* Fri Feb 07 2025 Lukas Javorsky <ljavorsk@redhat.com> - 8.0.41-1 * Fri Feb 07 2025 Lukas Javorsky <ljavorsk@redhat.com> - 8.0.41-1
- Update to MySQL 8.0.41 - Update to MySQL 8.0.41