diff --git a/boost-1.76.0-fix_multiprecision_issue_419-ppc64le.patch b/boost-1.76.0-fix_multiprecision_issue_419-ppc64le.patch new file mode 100644 index 0000000000000000000000000000000000000000..71552bfd0dd53bd84194f8b4dc53b78db38bffbb --- /dev/null +++ b/boost-1.76.0-fix_multiprecision_issue_419-ppc64le.patch @@ -0,0 +1,27 @@ +From d1343f28dcbe25b100b082b34775bd92ead4602c Mon Sep 17 00:00:00 2001 +From: jzmaddock +Date: Tue, 25 Jan 2022 09:27:40 +0000 +Subject: [PATCH] Update gcc Intel intrinsic usage config. Fixes + https://github.com/boostorg/multiprecision/issues/419. + +--- + include/boost/multiprecision/cpp_int/intel_intrinsics.hpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp b/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp +index eb4624bb4..37717cd51 100644 +--- a/boost/multiprecision/cpp_int/intel_intrinsics.hpp ++++ b/boost/multiprecision/cpp_int/intel_intrinsics.hpp +@@ -19,7 +19,11 @@ + // If this is GCC/clang, then check that the actual intrinsic exists: + // + #if defined(__has_builtin) && defined(__GNUC__) +-#if !__has_builtin(__builtin_ia32_addcarryx_u64) && defined(BOOST_MP_HAS_IMMINTRIN_H) && !(defined(BOOST_GCC) && (__GNUC__ >= 9)) ++#if !__has_builtin(__builtin_ia32_addcarryx_u64) && defined(BOOST_MP_HAS_IMMINTRIN_H) \ ++ && !(defined(BOOST_GCC) && (__GNUC__ >= 9) \ ++ && (defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64)\ ++ || defined(i386) || defined(__i386) || defined(__i386__) || defined(_M_AMD64) \ ++ || defined(_M_X64) || defined(__amd64__) || defined(_M_X64))) + #undef BOOST_MP_HAS_IMMINTRIN_H + #endif + #elif defined(BOOST_MP_HAS_IMMINTRIN_H) && defined(__GNUC__) && !(defined(BOOST_GCC) && (__GNUC__ >= 9)) diff --git a/mysql-boost-8.0.41.tar.gz b/mysql-boost-8.0.41.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8eb8239224821ab95947c76cf3c0cd322b9ac304 Binary files /dev/null and b/mysql-boost-8.0.41.tar.gz differ diff --git a/mysql.spec b/mysql.spec index 20fdbe079636567adb8f0934ebecef48e24953e2..7f13137934cd3400d02417d43a436ccd2f6ee876 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 # Name of the package without any prefixes %global pkg_name %{name} %global pkgnamepatch mysql @@ -75,33 +75,36 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: mysql -Version: 8.0.43 +Version: 8.0.43 Release: %{anolis_release}%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com +Source0: https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.41.tar.gz +Source2: mysql_config_multilib.sh +Source3: my.cnf.in +Source6: README.mysql-docs +Source7: README.mysql-license +Source10: mysql.tmpfiles.d.in +Source11: mysql.service.in +Source12: mysql-prepare-db-dir.sh +Source14: mysql-check-socket.sh +Source15: mysql-scripts-common.sh +Source17: mysql-wait-stop.sh +Source18: mysql@.service.in +Source30: mysql.rpmlintrc +Source31: server.cnf.in +Source50: rh-skipped-tests-list-base.list +Source51: rh-skipped-tests-list-arm.list +Source52: rh-skipped-tests-list-s390.list +Source53: rh-skipped-tests-list-ppc.list # Exceptions allow client libraries to be linked with most open source SW, # not only GPL code. See README.mysql-license License: GPLv2 with exceptions and LGPLv2 and BSD -Source0: https://dev.mysql.com/get/Downloads/MySQL-8.0/%{name}-boost-%{version}.tar.gz -Source2: mysql_config_multilib.sh -Source3: my.cnf.in -Source6: README.mysql-docs -Source7: README.mysql-license -Source10: mysql.tmpfiles.d.in -Source11: mysql.service.in -Source12: mysql-prepare-db-dir.sh -Source14: mysql-check-socket.sh -Source15: mysql-scripts-common.sh -Source17: mysql-wait-stop.sh -Source18: mysql@.service.in # To track rpmlint warnings -Source30: %{pkgnamepatch}.rpmlintrc # Configuration for server -Source31: server.cnf.in # Skipped tests lists -Source50: skipped-tests-list-base.list Patch1: %{pkgnamepatch}-install-test.patch Patch2: %{pkgnamepatch}-file-contents.patch @@ -122,6 +125,7 @@ Patch113: add-loongarch64-support-for-mysql.patch #add support for riscv64 Patch114: riscv-lock-free.patch +Patch115: boost-1.76.0-fix_multiprecision_issue_419-ppc64le.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -196,6 +200,7 @@ BuildRequires: make # Since MySQL 8.0.28 BuildRequires: libfido2-devel +BuildRequires: multilib-rpm-config Requires: bash coreutils grep @@ -937,6 +942,8 @@ fi %endif %changelog +* Fri Sep 12 2025 Wenyuzifangtest001 - 8.0.43-2 +- Apply patch to ensure efficient math operations on x86/x64 with GCC 9+ * Tue Jul 29 2025 wenxin - 8.0.43-1 - update 8.0.43 - fix cve CVE-2025-50081 diff --git a/rh-skipped-tests-list-arm.list b/rh-skipped-tests-list-arm.list new file mode 100644 index 0000000000000000000000000000000000000000..4a423e7a4074123cd3ca28f5f2b52dd8dd8ba19b --- /dev/null +++ b/rh-skipped-tests-list-arm.list @@ -0,0 +1,9 @@ +# Failing on C9S & RHEL 9 for MySQL release 8.0.27 +sys_vars.innodb_buffer_pool_size_basic : BUG#0 + +# Unstable on aarch64 since MySQL 8.0.28 +innodb_undo.undo_settings : BUG#0 + +# Unstable on aarch64 since MySQL 8.0.36 +sys_vars.myisam_data_pointer_size_func : BUG#0 +rpl.rpl_eventlog_psi_memory : BUG#0 diff --git a/rh-skipped-tests-list-base.list b/rh-skipped-tests-list-base.list new file mode 100644 index 0000000000000000000000000000000000000000..7ef4531167683c6046514744b2de4d177bac03e1 --- /dev/null +++ b/rh-skipped-tests-list-base.list @@ -0,0 +1,38 @@ +# Fails on all arches +main.subquery_sj_mat_bka_nobnl : BUG#0 failing since 8.0.24 on F32+ +main.derived_limit : BUG#0 failing since 8.0.24 on F32+ +main.explain_tree : BUG#0 failing since 8.0.24 on F32+ + +auth_sec.keyring_file_data_qa : BUG#0 failing on F32+ +innodb.alter_kill : BUG#0 failing on F34+ +main.mtr_unit_tests : BUG#0 failing on F35+ + +# Fails when -DENABLED_LOCAL_INFILE=ON +main.mysql_load_data_local_dir : BUG#0 failing on F32+ + +# Unstable +innodb.innodb_force_recovery : BUG#0 unstable since 8.0.24 on F32+ +clone.local_dml_auto_tune : BUG#0 unstable on x86_64 and i686 +perfschema.threads_mysql : BUG#0 unstable on x86_64 and i686 +rpl_gtid.rpl_multi_source_mtr_includes : BUG#0 unstable on x86_64 and i686 + +# Failing on 32-bit arches: armv7hl i686 s390x; since MySQL 8.0.25 +x.connection_unixsocket : BUG#0 +x.connection_unixsocket_invalid : BUG#0 +x.connection_unixsocket_lock : BUG#0 +innodb.innodb_bug-13628249 : BUG#0 + +# Failing since MySQL 8.0.29 +main.mysqlpump_bugs : BUG#0 + +# Failing since MySQL 8.0.30 +auth_sec.fips : BUG#0 +rpl.rpl_fips : BUG#0 + +# Failing since MySQL 8.0.35 +binlog.binlog_mysqlbinlog_linux : BUG#0 +perfschema.idx_session_connect_attrs : BUG#0 +rpl_gtid.mysqldump_bug33630199 : BUG#0 + +# Failing since MySQL 8.0.40 +main.time_zone : BUG#0 diff --git a/rh-skipped-tests-list-ppc.list b/rh-skipped-tests-list-ppc.list new file mode 100644 index 0000000000000000000000000000000000000000..579f9e70ad0033ae74509ade4b84034270d4adc7 --- /dev/null +++ b/rh-skipped-tests-list-ppc.list @@ -0,0 +1,5 @@ +# ppc64le +sys_vars.innodb_buffer_pool_size_basic : BUG#0 fails only on ppc64le on f32+ + +# Unstable on 8.0.35 +rpl.rpl_replica_terminology : BUG#0 diff --git a/rh-skipped-tests-list-s390.list b/rh-skipped-tests-list-s390.list new file mode 100644 index 0000000000000000000000000000000000000000..3a6668d9c8ce16e57d3e27a8ea5972ef0f17e893 --- /dev/null +++ b/rh-skipped-tests-list-s390.list @@ -0,0 +1,5 @@ +# Fails since 8.0.22 +main.subquery_bugs : BUG#0 + +# Failing on C9S & RHEL 9 for MySQL release 8.0.33 +main.subquery_sj_all_bka_nobnl : BUG#0 diff --git a/server.cnf.in b/server.cnf.in index ba3d47946ea4c10bb4079ef85abb80443a18b4c4..727ca527cee51674e7568a1c5333ab3f594f783f 100644 --- a/server.cnf.in +++ b/server.cnf.in @@ -13,6 +13,6 @@ [mysqld] datadir=@MYSQL_DATADIR@ socket=@MYSQL_UNIX_ADDR@ -log-error=@LOG_LOCATION@ +log-error=@LOGFILE_RPM@ pid-file=@PID_FILE_DIR@/@DAEMON_NO_PREFIX@.pid