From 468cb126b384918b3aecc520a5d94950d75030cf Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Fri, 10 Oct 2025 11:44:25 +0800 Subject: [PATCH 1/4] [CVE]update to mysql-8.0.43-1 to #ID1657 update to mysql-8.0.43-1 for CVE-2025-21574 CVE-2025-21575 CVE-2025-21577 CVE-2025-21579 CVE-2025-21580 CVE-2025-21581 CVE-2025-21584 Project: TC2024080204 Signed-off-by: Jacob Wang --- 1000-anolis-mysql-support-loongarch64.patch | 14 - ...-fix-derived-condition-pushdown-test.patch | 22 - ...have_32bits_time-test-on-loongarch64.patch | 11 - ...-loaddata-special-test-for-loongarch.patch | 24 - download | 2 +- mysql-paths.patch | 44 +- mysql.spec | 551 +++++++++--------- rh-skipped-tests-list-base.list | 14 + rh-skipped-tests-list-s390.list | 13 + 9 files changed, 314 insertions(+), 381 deletions(-) delete mode 100644 1000-anolis-mysql-support-loongarch64.patch delete mode 100644 1001-fix-derived-condition-pushdown-test.patch delete mode 100644 1002-skip-have_32bits_time-test-on-loongarch64.patch delete mode 100644 1003-fix-loaddata-special-test-for-loongarch.patch diff --git a/1000-anolis-mysql-support-loongarch64.patch b/1000-anolis-mysql-support-loongarch64.patch deleted file mode 100644 index 0d80cb8..0000000 --- a/1000-anolis-mysql-support-loongarch64.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/boost/boost_1_77_0/boost/predef/other/endian.h b/boost/boost_1_73_0/boost/predef/other/endian.h -index b42da538..8cd0a508 100644 ---- a/boost/boost_1_77_0/boost/predef/other/endian.h -+++ b/boost/boost_1_77_0/boost/predef/other/endian.h -@@ -125,7 +125,8 @@ information and acquired knowledge: - defined(__MIPSEL) || \ - defined(__MIPSEL__) || \ - defined(__riscv) || \ -- defined(__e2k__) -+ defined(__e2k__) || \ -+ defined(__loongarch__) - # undef BOOST_ENDIAN_LITTLE_BYTE - # define BOOST_ENDIAN_LITTLE_BYTE BOOST_VERSION_NUMBER_AVAILABLE - # endif diff --git a/1001-fix-derived-condition-pushdown-test.patch b/1001-fix-derived-condition-pushdown-test.patch deleted file mode 100644 index c9e0414..0000000 --- a/1001-fix-derived-condition-pushdown-test.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- mysql-test/t/derived_condition_pushdown.test.orig 2023-05-19 15:10:36.491463748 +0800 -+++ mysql-test/t/derived_condition_pushdown.test 2023-05-19 15:13:37.235839144 +0800 -@@ -1312,7 +1312,7 @@ - --skip_if_hypergraph # Depends on the query plan. - eval EXECUTE stmt USING @a, @b; - SET @a = 2; --SET @b = '2023-05-06 16:49:45'; -+SET @b = '2033-05-06 16:49:45'; - SET timestamp=UNIX_TIMESTAMP('2023-05-06 16:49:45'); - --replace_regex $elide_costs - --skip_if_hypergraph # Depends on the query plan. ---- mysql-test/r/derived_condition_pushdown.result.orig 2023-05-19 13:53:02.848129213 +0800 -+++ mysql-test/r/derived_condition_pushdown.result 2023-05-19 15:13:15.712675361 +0800 -@@ -2110,7 +2110,7 @@ - -> Zero rows (no matching row in const table) (rows=0) - - SET @a = 2; --SET @b = '2023-05-06 16:49:45'; -+SET @b = '2033-05-06 16:49:45'; - SET timestamp=UNIX_TIMESTAMP('2023-05-06 16:49:45'); - EXECUTE stmt USING @a, @b; - EXPLAIN diff --git a/1002-skip-have_32bits_time-test-on-loongarch64.patch b/1002-skip-have_32bits_time-test-on-loongarch64.patch deleted file mode 100644 index eecf4f4..0000000 --- a/1002-skip-have_32bits_time-test-on-loongarch64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mysql-8.0.32/mysql-test/include/have_32bits_time.inc 2022-12-16 23:34:44.000000000 +0800 -+++ mysql-8.0.32/mysql-test/include/have_32bits_time.inc.new 2023-05-19 22:46:34.731475815 +0800 -@@ -2,7 +2,7 @@ - - let $have_64bit = `SELECT @@version_compile_machine IN - ('x86_64', 'amd64', 'sparc', 'sparc64', 'arm64', 'aarch64', -- 'ppc64', 'ppc64le', 's390x')`; -+ 'loongarch64', 'ppc64', 'ppc64le', 's390x')`; - if ($have_64bit) { - --skip Doesn't support 32 bits UNIX time, only 64 bits - } diff --git a/1003-fix-loaddata-special-test-for-loongarch.patch b/1003-fix-loaddata-special-test-for-loongarch.patch deleted file mode 100644 index 308aa99..0000000 --- a/1003-fix-loaddata-special-test-for-loongarch.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- mysql-test/t/loaddata_special.test.orig 2023-05-20 11:42:30.956908281 +0800 -+++ mysql-test/t/loaddata_special.test 2023-05-22 10:38:18.345995071 +0800 -@@ -13,7 +13,7 @@ - SET GLOBAL net_buffer_length = 1024; - SET GLOBAL max_allowed_packet = 1024; - connect (con2,localhost,root,,); # Makes max_allowed_packet take effect, globally. --select load_file("/proc/modules"); -+select load_file("/proc/crypto"); - connection default; - SET GLOBAL max_allowed_packet = @old_max_allowed_packet; - SET GLOBAL net_buffer_length = @old_net_buffer_length; ---- mysql-test/r/loaddata_special.result.orig 2023-05-20 10:05:30.205788721 +0800 -+++ mysql-test/r/loaddata_special.result 2023-05-22 10:39:16.085415447 +0800 -@@ -6,8 +6,8 @@ - SET @old_max_allowed_packet= @@global.max_allowed_packet; - SET GLOBAL net_buffer_length = 1024; - SET GLOBAL max_allowed_packet = 1024; --select load_file("/proc/modules"); --load_file("/proc/modules") -+select load_file("/proc/crypto"); -+load_file("/proc/crypto") - NULL - Warnings: - Warning 1301 Result of load_file() was larger than max_allowed_packet (1024) - truncated diff --git a/download b/download index 2f66c06..590783c 100644 --- a/download +++ b/download @@ -1 +1 @@ -6836fe6426f9d5b6c3ff576b9d1e147f mysql-boost-8.0.41.tar.gz +5f44ad3ef68dc943e145f26574dcf435 mysql-boost-8.0.43.tar.gz diff --git a/mysql-paths.patch b/mysql-paths.patch index d5978b6..517025d 100644 --- a/mysql-paths.patch +++ b/mysql-paths.patch @@ -3,11 +3,10 @@ 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) +diff -Naur mysql-8.0.43/cmake/install_layout.cmake mysql-8.0.43_patched/cmake/install_layout.cmake +--- mysql-8.0.43/cmake/install_layout.cmake 2025-07-09 10:45:01.000000000 +0200 ++++ mysql-8.0.43_patched/cmake/install_layout.cmake 2025-08-05 09:22:54.506782584 +0200 +@@ -106,7 +106,7 @@ " Choose between ${VALID_INSTALL_LAYOUTS}" ) ENDIF() @@ -16,19 +15,18 @@ index 9f7945d8..6734cdfd 100644 CACHE PATH "config directory (for my.cnf)") MARK_AS_ADVANCED(SYSCONFDIR) 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") +@@ -202,6 +202,7 @@ + ELSE() + SET(INSTALL_SBINDIR_RPM "sbin") + ENDIF() +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.0.43/mysys/my_default.cc mysql-8.0.43_patched/mysys/my_default.cc +--- mysql-8.0.43/mysys/my_default.cc 2025-07-09 10:45:01.000000000 +0200 ++++ mysql-8.0.43_patched/mysys/my_default.cc 2025-08-05 09:24:59.510804797 +0200 +@@ -1652,12 +1652,12 @@ #else @@ -44,11 +42,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.0.43/scripts/CMakeLists.txt mysql-8.0.43_patched/scripts/CMakeLists.txt +--- mysql-8.0.43/scripts/CMakeLists.txt 2025-07-09 10:45:01.000000000 +0200 ++++ mysql-8.0.43_patched/scripts/CMakeLists.txt 2025-08-05 09:25:55.019369630 +0200 +@@ -271,9 +271,9 @@ ENDIF(UNIX) SET(prefix "${CMAKE_INSTALL_PREFIX}") @@ -60,11 +57,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.0.43/scripts/mysqld_multi.pl.in mysql-8.0.43_patched/scripts/mysqld_multi.pl.in +--- mysql-8.0.43/scripts/mysqld_multi.pl.in 2025-07-09 10:45:01.000000000 +0200 ++++ mysql-8.0.43_patched/scripts/mysqld_multi.pl.in 2025-08-05 09:26:57.252077640 +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 $_ } diff --git a/mysql.spec b/mysql.spec index ac0a609..ee1054b 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,10 +1,9 @@ -%define anolis_release .0.1 # SCL stuff %{?scl:%scl_package mysql} %{!?scl:%global pkg_name %{name}} # To both save infrastrucutre resources and workaround testsuite clashes -ExcludeArch: %{ix86} +ExcludeArch: %{ix86} # Name of the package without any prefixes %global pkgnamepatch mysql @@ -15,12 +14,12 @@ ExcludeArch: %{ix86} %{!?runselftest:%global runselftest 1} # Set this to 1 to see which tests fail, but 0 on production ready build -%global ignore_testsuite_result 0 +%{!?check_testsuite:%global ignore_testsuite_result 0} # 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.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 %global force_run_testsuite 0 @@ -87,7 +86,7 @@ ExcludeArch: %{ix86} %bcond_with bundled_zstd %bcond_with bundled_fido2 %endif -%global zstd_bundled_version 1.5.5 +%global zstd_bundled_version 1.5.7 %global libevent_bundled_version 2.1.11 %global fido2_bundled_version 1.15.0 @@ -147,148 +146,143 @@ ExcludeArch: %{ix86} %global scl_upper %{lua:print(string.upper(string.gsub(rpm.expand("%{scl}"), "-", "_")))} %endif -Name: %{?scl_prefix}mysql -Version: 8.0.41 -Release: 1%{anolis_release}%{?with_debug:.debug}%{?dist} -Summary: MySQL client programs and shared libraries -URL: http://www.mysql.com +Name: %{?scl_prefix}mysql +Version: 8.0.43 +Release: 1%{?with_debug:.debug}%{?dist} +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: GPLv2 with exceptions and LGPLv2 and BSD - -Source0: https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-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 -Source13: mysql-wait-ready.sh -Source14: mysql-check-socket.sh -Source15: mysql-scripts-common.sh -Source16: mysql-check-upgrade.sh -Source17: mysql-wait-stop.sh -Source18: mysql@.service.in -Source19: mysql.init.in +License: GPLv2 with exceptions and LGPLv2 and BSD + +Source0: https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-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 +Source13: mysql-wait-ready.sh +Source14: mysql-check-socket.sh +Source15: mysql-scripts-common.sh +Source16: mysql-check-upgrade.sh +Source17: mysql-wait-stop.sh +Source18: mysql@.service.in +Source19: mysql.init.in # To track rpmlint warnings -Source30: mysql-5.6.10-rpmlintrc +Source30: mysql-5.6.10-rpmlintrc # Configuration for server -Source31: server.cnf.in -Source32: default-authentication-plugin.cnf -Source40: daemon-scl-helper.sh -Source41: mysql-sysnice.te +Source31: server.cnf.in +Source32: default-authentication-plugin.cnf +Source40: daemon-scl-helper.sh +Source41: mysql-sysnice.te # Skipped tests lists -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 +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 # Comments for these patches are in the patch files # Patches common for more mysql-like packages -Patch1: %{pkgnamepatch}-install-test.patch -Patch3: %{pkgnamepatch}-file-contents.patch -Patch4: %{pkgnamepatch}-scripts.patch -Patch5: %{pkgnamepatch}-paths.patch +Patch1: %{pkgnamepatch}-install-test.patch +Patch3: %{pkgnamepatch}-file-contents.patch +Patch4: %{pkgnamepatch}-scripts.patch +Patch5: %{pkgnamepatch}-paths.patch # Patches specific for this mysql package -Patch51: %{pkgnamepatch}-sharedir.patch -Patch53: %{pkgnamepatch}-mtr.patch -Patch54: %{pkgnamepatch}-arm32-timer.patch -Patch55: %{pkgnamepatch}-c99.patch +Patch51: %{pkgnamepatch}-sharedir.patch +Patch53: %{pkgnamepatch}-mtr.patch +Patch54: %{pkgnamepatch}-arm32-timer.patch +Patch55: %{pkgnamepatch}-c99.patch # Patches specific for scl -Patch90: %{pkgnamepatch}-scl-env-check.patch -Patch91: %{pkgnamepatch}-rpath.patch +Patch90: %{pkgnamepatch}-scl-env-check.patch +Patch91: %{pkgnamepatch}-rpath.patch # Patches taken from boost 1.59 -Patch111: boost-1.58.0-pool.patch -Patch112: boost-1.57.0-mpl-print.patch +Patch111: boost-1.58.0-pool.patch +Patch112: boost-1.57.0-mpl-print.patch # Patches taken from boost 1.76 -Patch113: boost-1.76.0-fix_multiprecision_issue_419-ppc64le.patch +Patch113: boost-1.76.0-fix_multiprecision_issue_419-ppc64le.patch # Use same logfile path in logrotate and mysql configs -Patch126: mysql-logrotate-log-path.patch - -Patch1000: 1000-anolis-mysql-support-loongarch64.patch -Patch1001: 1001-fix-derived-condition-pushdown-test.patch -Patch1002: 1002-skip-have_32bits_time-test-on-loongarch64.patch -Patch1003: 1003-fix-loaddata-special-test-for-loongarch.patch - -BuildRequires: cmake -BuildRequires: gcc-c++ -BuildRequires: libaio-devel -BuildRequires: libedit-devel -BuildRequires: libevent-devel -BuildRequires: libicu-devel -BuildRequires: %{?scl_prefix}lz4 -BuildRequires: %{?scl_prefix}lz4-devel -BuildRequires: %{?scl_prefix}mecab-devel -BuildRequires: %{?scl_prefix}bison -BuildRequires: %{?scl_prefix}libcurl-devel +Patch126: mysql-logrotate-log-path.patch + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: libaio-devel +BuildRequires: libedit-devel +BuildRequires: libevent-devel +BuildRequires: libicu-devel +BuildRequires: %{?scl_prefix}lz4 +BuildRequires: %{?scl_prefix}lz4-devel +BuildRequires: %{?scl_prefix}mecab-devel +BuildRequires: %{?scl_prefix}bison +BuildRequires: %{?scl_prefix}libcurl-devel %ifnarch aarch64 %{arm} s390 s390x -BuildRequires: numactl-devel +BuildRequires: numactl-devel %endif -BuildRequires: openssl-devel +BuildRequires: openssl-devel %if 0%{?fedora} > 24 || 0%{?rhel} > 7 -BuildRequires: perl-interpreter -BuildRequires: perl-generators +BuildRequires: perl-interpreter +BuildRequires: perl-generators %endif %if 0%{?fedora} > 27 || 0%{?rhel} > 7 -BuildRequires: rpcgen -BuildRequires: libtirpc-devel +BuildRequires: rpcgen +BuildRequires: libtirpc-devel %endif %if %{without bundled_protobuf} -BuildRequires: protobuf-lite-devel +BuildRequires: protobuf-lite-devel %endif -BuildRequires: rapidjson-devel -BuildRequires: zlib -BuildRequires: zlib-devel -BuildRequires: multilib-rpm-config +BuildRequires: rapidjson-devel +BuildRequires: zlib +BuildRequires: zlib-devel +BuildRequires: multilib-rpm-config # Tests requires time and ps and some perl modules -BuildRequires: procps -BuildRequires: time -BuildRequires: perl(base) -BuildRequires: perl(Carp) -BuildRequires: perl(Cwd) -BuildRequires: perl(Digest::file) -BuildRequires: perl(Digest::MD5) -BuildRequires: perl(English) -BuildRequires: perl(Env) -BuildRequires: perl(Errno) -BuildRequires: perl(Exporter) -BuildRequires: perl(Fcntl) -BuildRequires: perl(File::Basename) -BuildRequires: perl(File::Copy) -BuildRequires: perl(File::Find) -BuildRequires: perl(File::Spec) -BuildRequires: perl(File::Spec::Functions) -BuildRequires: perl(File::Temp) -BuildRequires: perl(FindBin) -BuildRequires: perl(Data::Dumper) -BuildRequires: perl(Getopt::Long) -BuildRequires: perl(if) -BuildRequires: perl(IO::File) -BuildRequires: perl(IO::Handle) -BuildRequires: perl(IO::Select) -BuildRequires: perl(IO::Socket::INET) -BuildRequires: perl(IPC::Open3) -BuildRequires: perl(JSON) -BuildRequires: perl(lib) -BuildRequires: perl(LWP::Simple) -BuildRequires: perl(Memoize) -BuildRequires: perl(Net::Ping) -BuildRequires: perl(POSIX) -BuildRequires: perl(Socket) -BuildRequires: perl(strict) -BuildRequires: perl(Sys::Hostname) -BuildRequires: perl(Test::More) -BuildRequires: perl(Time::HiRes) -BuildRequires: perl(Time::localtime) -BuildRequires: perl(warnings) -BuildRequires: make +BuildRequires: procps +BuildRequires: time +BuildRequires: perl(base) +BuildRequires: perl(Carp) +BuildRequires: perl(Cwd) +BuildRequires: perl(Digest::file) +BuildRequires: perl(Digest::MD5) +BuildRequires: perl(English) +BuildRequires: perl(Env) +BuildRequires: perl(Errno) +BuildRequires: perl(Exporter) +BuildRequires: perl(Fcntl) +BuildRequires: perl(File::Basename) +BuildRequires: perl(File::Copy) +BuildRequires: perl(File::Find) +BuildRequires: perl(File::Spec) +BuildRequires: perl(File::Spec::Functions) +BuildRequires: perl(File::Temp) +BuildRequires: perl(FindBin) +BuildRequires: perl(Data::Dumper) +BuildRequires: perl(Getopt::Long) +BuildRequires: perl(if) +BuildRequires: perl(IO::File) +BuildRequires: perl(IO::Handle) +BuildRequires: perl(IO::Select) +BuildRequires: perl(IO::Socket::INET) +BuildRequires: perl(IPC::Open3) +BuildRequires: perl(JSON) +BuildRequires: perl(lib) +BuildRequires: perl(LWP::Simple) +BuildRequires: perl(Memoize) +BuildRequires: perl(Net::Ping) +BuildRequires: perl(POSIX) +BuildRequires: perl(Socket) +BuildRequires: perl(strict) +BuildRequires: perl(Sys::Hostname) +BuildRequires: perl(Test::More) +BuildRequires: perl(Time::HiRes) +BuildRequires: perl(Time::localtime) +BuildRequires: perl(warnings) +BuildRequires: make %{?with_init_systemd:BuildRequires: systemd} # libzstd %{!?with_bundled_zstd:BuildRequires: libzstd-devel} @@ -301,35 +295,35 @@ BuildRequires: make # aarch64 requires newer gcc %if 0%{?rhel} == 7 && 0%{?scl:1} %global dts devtoolset-7 -BuildRequires: %{dts}-gcc-c++ +BuildRequires: %{dts}-gcc-c++ %endif -BuildRequires: selinux-policy-devel +BuildRequires: selinux-policy-devel -Requires: bash coreutils grep -Requires: %{name}-common%{?_isa} = %{sameevr} +Requires: bash coreutils grep +Requires: %{name}-common%{?_isa} = %{sameevr} %{?scl:Requires:%scl_runtime} -Provides: bundled(boost) = %{boost_bundled_version} +Provides: bundled(boost) = %{boost_bundled_version} %if %{with bundled_protobuf} -Provides: bundled(protobuf) = %{protobuf_bundled_version} +Provides: bundled(protobuf) = %{protobuf_bundled_version} %endif %if %{with bundled_zstd} -Provides: bundled(zstd) = %{zstd_bundled_version} +Provides: bundled(zstd) = %{zstd_bundled_version} %endif %if %{with bundled_fido2} -Provides: bundled(fido2) = %{fido2_bundled_version} +Provides: bundled(fido2) = %{fido2_bundled_version} %endif %if %{with mysql_names} -Provides: mysql = %{sameevr} -Provides: mysql%{?_isa} = %{sameevr} -Provides: mysql-compat-client = %{sameevr} -Provides: mysql-compat-client%{?_isa} = %{sameevr} +Provides: mysql = %{sameevr} +Provides: mysql%{?_isa} = %{sameevr} +Provides: mysql-compat-client = %{sameevr} +Provides: mysql-compat-client%{?_isa} = %{sameevr} %endif %{?with_conflicts:Conflicts: mariadb} # mysql-cluster used to be built from this SRPM, but no more -Obsoletes: mysql-cluster < 5.1.44 +Obsoletes: mysql-cluster < 5.1.44 # Filtering: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering %if 0%{?fedora} > 14 || 0%{?rhel} > 6 @@ -350,12 +344,12 @@ contains the standard MySQL client programs and generic MySQL files. %if %{with clibrary} %package libs -Summary: The shared libraries required for MySQL clients -Requires: %{name}-common%{?_isa} = %{sameevr} +Summary: The shared libraries required for MySQL clients +Requires: %{name}-common%{?_isa} = %{sameevr} %{?scl:Requires:%scl_runtime} %if %{with mysql_names} -Provides: mysql-libs = %{sameevr} -Provides: mysql-libs%{?_isa} = %{sameevr} +Provides: mysql-libs = %{sameevr} +Provides: mysql-libs%{?_isa} = %{sameevr} %endif %description libs @@ -368,7 +362,7 @@ MySQL server. %if %{with config} %package config -Summary: The config files required by server and client +Summary: The config files required by server and client %{?scl:Requires:%scl_runtime} %description config @@ -381,8 +375,8 @@ package itself. %if %{with common} %package common -Summary: The shared files required for MySQL server and client -Requires: %{_sysconfdir}/my.cnf +Summary: The shared files required for MySQL server and client +Requires: %{_sysconfdir}/my.cnf %{?scl:Requires:%scl_runtime} %description common @@ -394,9 +388,9 @@ MySQL package. %if %{with errmsg} %package errmsg -Summary: The error messages files required by MySQL server -Group: Applications/Databases -Requires: %{name}-common%{?_isa} = %{sameevr} +Summary: The error messages files required by MySQL server +Group: Applications/Databases +Requires: %{name}-common%{?_isa} = %{sameevr} %{?scl:Requires:%scl_runtime} %description errmsg @@ -405,24 +399,24 @@ The package provides error messages files for the MySQL daemon %package server -Summary: The MySQL server and related files +Summary: The MySQL server and related files # Require any mysql client, but prefer mysql client for mysql server %if 0%{?fedora} || 0%{?rhel} > 7 -Suggests: %{name}%{?_isa} = %{sameevr} +Suggests: %{name}%{?_isa} = %{sameevr} %endif -Requires: %{?scl_prefix}mysql%{?_isa} +Requires: %{?scl_prefix}mysql%{?_isa} -Requires: %{name}-common%{?_isa} = %{sameevr} -Requires: %{_sysconfdir}/my.cnf -Requires: %{_sysconfdir}/my.cnf.d -Requires: %{name}-errmsg%{?_isa} = %{sameevr} +Requires: %{name}-common%{?_isa} = %{sameevr} +Requires: %{_sysconfdir}/my.cnf +Requires: %{_sysconfdir}/my.cnf.d +Requires: %{name}-errmsg%{?_isa} = %{sameevr} %{?mecab:Requires: %{?scl_prefix}mecab-ipadic} -Requires: coreutils +Requires: coreutils Requires(pre): /usr/sbin/useradd %if %{with init_systemd} # We require this to be present for %%{_tmpfilesdir} -Requires: systemd +Requires: systemd # Make sure it's there when scriptlets run, too %{?systemd_requires: %systemd_requires} # semanage @@ -435,17 +429,17 @@ Requires(post): policycoreutils-python %{?scl:BuildRequires: scl-utils-build-helpers} %endif %if %{with mysql_names} -Provides: mysql-server = %{sameevr} -Provides: mysql-server%{?_isa} = %{sameevr} -Provides: mysql-compat-server = %{sameevr} -Provides: mysql-compat-server%{?_isa} = %{sameevr} -Obsoletes: mysql-bench < 5.7.8 +Provides: mysql-server = %{sameevr} +Provides: mysql-server%{?_isa} = %{sameevr} +Provides: mysql-compat-server = %{sameevr} +Provides: mysql-compat-server%{?_isa} = %{sameevr} +Obsoletes: mysql-bench < 5.7.8 %endif -Obsoletes: mysql-bench < 5.7.8 +Obsoletes: mysql-bench < 5.7.8 %{?with_conflicts:Conflicts: mariadb-server} %{?with_conflicts:Conflicts: mariadb-galera-server} # A dependency mistake was made, to fix it, old version of the utils must be Obsoleted. Affected versions: F24, F25, F26 until their EOL. -Obsoletes: mariadb-server-utils < 3:10.1.21-3 +Obsoletes: mariadb-server-utils < 3:10.1.21-3 %description server MySQL is a multi-user, multi-threaded SQL database server. MySQL is a @@ -456,10 +450,10 @@ the MySQL server and some accompanying files and directories. %if %{with devel} %package devel -Summary: Files for development of MySQL applications +Summary: Files for development of MySQL applications %{?with_clibrary:Requires: %{name}-libs%{?_isa} = %{sameevr}} -Requires: openssl-devel -Requires: zlib-devel +Requires: openssl-devel +Requires: zlib-devel %{!?with_bundled_zstd:Requires: libzstd} %{?with_conflicts:Conflicts: mariadb-devel} @@ -473,34 +467,34 @@ developing MySQL client applications. %if %{with test} %package test -Summary: The test suite distributed with MySQL -Requires: %{name}%{?_isa} = %{sameevr} -Requires: %{name}-common%{?_isa} = %{sameevr} -Requires: %{name}-server%{?_isa} = %{sameevr} -Requires: gzip -Requires: %{?scl_prefix}lz4 -Requires: perl(Digest::file) -Requires: perl(Digest::MD5) -Requires: perl(Env) -Requires: perl(Exporter) -Requires: perl(Fcntl) -Requires: perl(File::Temp) -Requires: perl(FindBin) -Requires: perl(Data::Dumper) -Requires: perl(Getopt::Long) -Requires: perl(IPC::Open3) -Requires: perl(JSON) -Requires: perl(LWP::Simple) -Requires: perl(Memoize) -Requires: perl(Socket) -Requires: perl(Sys::Hostname) -Requires: perl(Test::More) -Requires: perl(Time::HiRes) +Summary: The test suite distributed with MySQL +Requires: %{name}%{?_isa} = %{sameevr} +Requires: %{name}-common%{?_isa} = %{sameevr} +Requires: %{name}-server%{?_isa} = %{sameevr} +Requires: gzip +Requires: %{?scl_prefix}lz4 +Requires: perl(Digest::file) +Requires: perl(Digest::MD5) +Requires: perl(Env) +Requires: perl(Exporter) +Requires: perl(Fcntl) +Requires: perl(File::Temp) +Requires: perl(FindBin) +Requires: perl(Data::Dumper) +Requires: perl(Getopt::Long) +Requires: perl(IPC::Open3) +Requires: perl(JSON) +Requires: perl(LWP::Simple) +Requires: perl(Memoize) +Requires: perl(Socket) +Requires: perl(Sys::Hostname) +Requires: perl(Test::More) +Requires: perl(Time::HiRes) %{?with_conflicts:Conflicts: mariadb-test} %{?scl:Requires:%scl_runtime} %if %{with mysql_names} -Provides: mysql-test = %{sameevr} -Provides: mysql-test%{?_isa} = %{sameevr} +Provides: mysql-test = %{sameevr} +Provides: mysql-test%{?_isa} = %{sameevr} %endif %description test @@ -528,14 +522,6 @@ the MySQL sources. %patch55 -p1 %patch126 -p1 -%patch1000 -p1 -%patch1001 -p0 -%patch1002 -p1 - -%ifarch loongarch64 -%patch1003 -p0 -%endif - # Patch Boost pushd boost/boost_$(echo %{boost_bundled_version}| tr . _) %patch111 -p1 @@ -576,6 +562,7 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \ cp %{SOURCE41} mysql-sysnice.te + %build %{set_build_flags} @@ -984,9 +971,6 @@ if [ $1 = 1 ]; then /sbin/chkconfig --add %{daemon_name} fi %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) semanage fcontext -a -t mysqld_log_t '/var/log/mysql(/.*)?' restorecon -r %{logfiledir} @@ -1182,7 +1166,6 @@ fi %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} %{?scl:%config(noreplace) %{?_scl_scripts}/service-environment} @@ -1223,13 +1206,11 @@ fi %endif %changelog -* Thu Feb 20 2025 zhangbinchen - 8.0.41-1.0.1 -- remove check_testsuite -- redefine ignore_testsuite_result -- Support loongarch64 platform (liwei.glw@openanolis.org) -- skip have_32bits_time test on loongarch64 (liwei.glw@openanolis.org) -- fix main.derived_condition_pushdown test (rb01097748@alibaba-inc.com) -- fix loaddata_special test for loongarch64 (rb01097748@alibaba-inc.com) +* Wed Aug 06 2025 Pavol Sloboda - 8.0.43-1 +- Rebase to MySQL 8.0.43 + +* Thu Apr 24 2025 Pavol Sloboda - 8.0.42-1 +- Rebase to MySQL 8.0.42 * Fri Feb 07 2025 Lukas Javorsky - 8.0.41-1 - Update to MySQL 8.0.41 @@ -1936,7 +1917,7 @@ fi - Update to MySQL 5.5.29, for various fixes described at http://dev.mysql.com/doc/refman/5.5/en/news-5-5-29.html - Fix inaccurate default for socket location in mysqld-wait-ready -Resolves: #890535 +Resolves: #890535 * Thu Dec 6 2012 Honza Horak 5.5.28-3 - Rebase patches to not leave backup files when not applied smoothly @@ -1944,24 +1925,24 @@ Resolves: #890535 * Wed Dec 5 2012 Tom Lane 5.5.28-2 - Add patch for CVE-2012-5611 -Resolves: #883642 +Resolves: #883642 - Widen DH key length from 512 to 1024 bits to meet minimum requirements of FIPS 140-2 -Related: #877124 +Related: #877124 * Sat Sep 29 2012 Tom Lane 5.5.28-1 - Update to MySQL 5.5.28, for various fixes described at http://dev.mysql.com/doc/refman/5.5/en/news-5-5-28.html - Clean up partially-created database files when mysql_install_db fails -Related: #835131 +Related: #835131 - Honor user and group settings from service file in mysqld-prepare-db-dir -Resolves: #840431 +Resolves: #840431 - Export THR_KEY_mysys as a workaround for inadequate threading support -Resolves: #846602 +Resolves: #846602 - Adopt new systemd macros for server package install/uninstall triggers -Resolves: #850222 +Resolves: #850222 - Use --no-defaults when invoking mysqladmin to wait for the server to start -Related: #855704 +Related: #855704 * Sun Aug 5 2012 Tom Lane 5.5.27-1 - Update to MySQL 5.5.27, for various fixes described at @@ -1975,13 +1956,13 @@ Related: #855704 http://dev.mysql.com/doc/refman/5.5/en/news-5-5-25a.html http://dev.mysql.com/doc/refman/5.5/en/news-5-5-25.html - Don't use systemd's Restart feature; rely on mysqld_safe instead -Resolves: #832029 +Resolves: #832029 * Mon Jun 11 2012 Tom Lane 5.5.24-1 - Update to MySQL 5.5.24, for various fixes described at http://dev.mysql.com/doc/refman/5.5/en/news-5-5-24.html including the fix for CVE-2012-2122 -Resolves: #830680 +Resolves: #830680 - Tweak logrotate script to put the right permissions on mysqld.log - Minor specfile fixes for recent packaging guidelines changes @@ -1993,12 +1974,12 @@ Resolves: #830680 - Update to MySQL 5.5.22, for various fixes described at http://dev.mysql.com/doc/refman/5.5/en/news-5-5-22.html - Turn on PrivateTmp in service file -Resolves: #782513 +Resolves: #782513 - Comment out the contents of /etc/logrotate.d/mysqld, so that manual action is needed to enable log rotation. Given the multiple ways in which the rotation script can fail, it seems imprudent to try to make it run by default. -Resolves: #799735 +Resolves: #799735 * Tue Mar 20 2012 Honza Horak 5.5.21-3 - Revise mysql_plugin test patch so it moves plugin files to @@ -2006,7 +1987,7 @@ Resolves: #799735 * Tue Mar 13 2012 Honza Horak 5.5.21-2 - Fix ssl-related tests to specify expected cipher explicitly -Related: #789600 +Related: #789600 - Fix several strcpy calls to check destination size * Mon Feb 27 2012 Tom Lane 5.5.21-1 @@ -2014,7 +1995,7 @@ Related: #789600 http://dev.mysql.com/doc/refman/5.5/en/news-5-5-21.html - Hack openssl regression test to still work with rawhide's openssl - Fix assorted failures in post-install regression tests (mysql-test RPM) -Resolves: #789530 +Resolves: #789530 * Fri Feb 10 2012 Tom Lane 5.5.20-2 - Revise our test-disabling method to make it possible to disable tests on a @@ -2022,18 +2003,18 @@ Resolves: #789530 which broke in just about every upstream update (Honza Horak) - Disable cycle-counter-dependent regression tests on ARM, since there is not currently any support for that in Fedora ARM kernels -Resolves: #773116 +Resolves: #773116 - Add some comments to mysqld.service documenting how to customize it -Resolves: #785243 +Resolves: #785243 * Fri Jan 27 2012 Tom Lane 5.5.20-1 - Update to MySQL 5.5.20, for various fixes described at http://dev.mysql.com/doc/refman/5.5/en/news-5-5-20.html as well as security fixes described at http://www.oracle.com/technetwork/topics/security/cpujan2012-366304.html -Resolves: #783828 +Resolves: #783828 - Re-include the mysqld logrotate script, now that it's not so bogus -Resolves: #547007 +Resolves: #547007 * Wed Jan 4 2012 Tom Lane 5.5.19-1 - Update to MySQL 5.5.19, for various fixes described at @@ -2050,13 +2031,13 @@ Resolves: #547007 * Wed Nov 02 2011 Honza Horak 5.5.16-4 - Don't assume all ethernet devices are named ethX -Resolves: #682365 +Resolves: #682365 - Exclude user definition from my.cnf, user is defined in mysqld.service now -Resolves: #661265 +Resolves: #661265 * Sun Oct 16 2011 Tom Lane 5.5.16-3 - Fix unportable usage associated with va_list arguments -Resolves: #744707 +Resolves: #744707 * Sun Oct 16 2011 Tom Lane 5.5.16-2 - Update to MySQL 5.5.16, for various fixes described at @@ -2068,12 +2049,12 @@ Resolves: #744707 * Wed Jul 27 2011 Tom Lane 5.5.14-3 - Convert to systemd startup support (no socket activation, for now anyway) -Related: #714426 +Related: #714426 * Tue Jul 12 2011 Tom Lane 5.5.14-2 - Remove make_scrambled_password and make_scrambled_password_323 from mysql.h, since we're not allowing clients to call those functions anyway -Related: #690346 +Related: #690346 * Mon Jul 11 2011 Tom Lane 5.5.14-1 - Update to MySQL 5.5.14, for various fixes described at @@ -2081,7 +2062,7 @@ Related: #690346 * Wed Jul 6 2011 Tom Lane 5.5.13-2 - Remove erroneously-included Default-Start line from LSB init block -Resolves: #717024 +Resolves: #717024 * Thu Jun 2 2011 Tom Lane 5.5.13-1 - Update to MySQL 5.5.13, for various fixes described at @@ -2093,10 +2074,10 @@ Resolves: #717024 * Tue May 10 2011 Tom Lane 5.5.10-3 - Add LSB init block to initscript, to ensure sane ordering at system boot -Resolves: #703214 +Resolves: #703214 - Improve initscript start action to notice when mysqladmin is failing because of configuration problems -Related: #703476 +Related: #703476 - Remove exclusion of "gis" regression test, since upstream bug 59908 is fixed (for some value of "fixed") as of 5.5.10. @@ -2111,11 +2092,11 @@ Related: #703476 libmysqlclient.so, from .16 to .18 - Add tmpfiles.d config file so that /var/run/mysqld is recreated at boot (only needed in Fedora 15 and later) -Resolves: #658938 +Resolves: #658938 * Wed Feb 16 2011 Tom Lane 5.5.9-2 - Disable a regression test that is now showing platform-dependent results -Resolves: #674253 +Resolves: #674253 * Sat Feb 12 2011 Tom Lane 5.5.9-1 - Update to MySQL 5.5.9, for various fixes described at @@ -2132,12 +2113,12 @@ Resolves: #674253 * Thu Feb 3 2011 Tom Lane 5.5.8-8 - PPC64 floating-point differences are not masked by -ffloat-store after all, so let's just disable gis regression test till upstream makes it less picky -Resolves: #674253 +Resolves: #674253 - Add __perllib_requires setting to make rpm 4.9 do what we need * Wed Feb 2 2011 Tom Lane 5.5.8-7 - Work around some portability issues on PPC64 -Resolves: #674253 +Resolves: #674253 * Thu Jan 20 2011 Tom Lane 5.5.8-6 - Remove no-longer-needed special switches in CXXFLAGS, per yesterday's @@ -2146,17 +2127,17 @@ Resolves: #674253 * Thu Jan 13 2011 Tom Lane 5.5.8-5 - Fix failure to honor MYSQL_HOME environment variable -Resolves: #669364 +Resolves: #669364 * Thu Jan 13 2011 Tom Lane 5.5.8-4 - Fix crash during startup of embedded mysqld library -Resolves: #667365 +Resolves: #667365 * Mon Jan 3 2011 Tom Lane 5.5.8-3 - my_print_help, load_defaults, free_defaults, and handle_options all turn out to be documented/recommended in Paul DuBois' MySQL book, so we'd better consider them part of the de-facto API. -Resolves: #666728 +Resolves: #666728 * Mon Dec 27 2010 Tom Lane 5.5.8-2 - Add mysql_client_errors[] to the set of exported libmysqlclient symbols; @@ -2171,7 +2152,7 @@ Resolves: #666728 * Mon Nov 1 2010 Tom Lane 5.1.52-1 - Update to MySQL 5.1.52, for various fixes described at http://dev.mysql.com/doc/refman/5.1/en/news-5-1-52.html -Resolves: #646569 +Resolves: #646569 * Thu Oct 7 2010 Tom Lane 5.1.51-2 - Re-disable the outfile_loaddata test, per report from Dan Horak. @@ -2191,37 +2172,37 @@ Resolves: #646569 * Wed Jul 14 2010 Tom Lane 5.1.48-3 - Fix FTBFS with gcc 4.5. -Related: #614293 +Related: #614293 * Tue Jul 13 2010 Tom Lane 5.1.48-2 - Duplicate COPYING and EXCEPTIONS-CLIENT in -libs and -embedded subpackages, to ensure they are available when any subset of mysql RPMs are installed, per revised packaging guidelines - Allow init script's STARTTIMEOUT/STOPTIMEOUT to be overridden from sysconfig -Related: #609734 +Related: #609734 * Mon Jun 21 2010 Tom Lane 5.1.48-1 - Update to MySQL 5.1.48, for various fixes described at http://dev.mysql.com/doc/refman/5.1/en/news-5-1-48.html including a fix for CVE-2010-2008 -Related: #614214 +Related: #614214 * Fri Jun 4 2010 Tom Lane 5.1.47-2 - Add back "partition" storage engine -Resolves: #597390 +Resolves: #597390 - Fix broken "federated" storage engine plugin -Related: #587170 +Related: #587170 - Read all certificates in SSL certificate files, to support chained certs -Related: #598656 +Related: #598656 * Mon May 24 2010 Tom Lane 5.1.47-1 - Update to MySQL 5.1.47, for various fixes described at http://dev.mysql.com/doc/refman/5.1/en/news-5-1-47.html including fixes for CVE-2010-1848, CVE-2010-1849, CVE-2010-1850 -Resolves: #592862 -Resolves: #583717 +Resolves: #592862 +Resolves: #583717 - Create mysql group explicitly in pre-server script, to ensure correct GID -Related: #594155 +Related: #594155 * Sat Apr 24 2010 Tom Lane 5.1.46-1 - Update to MySQL 5.1.46, for various fixes described at @@ -2238,16 +2219,16 @@ Related: #594155 * Sun Feb 21 2010 Tom Lane 5.1.44-2 - Add "Obsoletes: mysql-cluster" to fix upgrade-in-place from F-12 - Bring init script into some modicum of compliance with Fedora/LSB standards -Related: #557711 -Related: #562749 +Related: #557711 +Related: #562749 * Sat Feb 20 2010 Tom Lane 5.1.44-1 - Update to MySQL 5.1.44, for various fixes described at http://dev.mysql.com/doc/refman/5.1/en/news-5-1-44.html - Remove mysql.info, which is not freely redistributable -Resolves: #560181 +Resolves: #560181 - Revert broken upstream fix for their bug 45058 -Resolves: #566547 +Resolves: #566547 * Sat Feb 13 2010 Tom Lane 5.1.43-2 - Remove mysql-cluster, which is no longer supported by upstream in this @@ -2259,19 +2240,19 @@ Resolves: #566547 * Fri Jan 29 2010 Tom Lane 5.1.42-7 - Add backported patch for CVE-2008-7247 (upstream bug 39277) -Related: #543619 +Related: #543619 - Use non-expired certificates for SSL testing (upstream bug 50702) * Tue Jan 26 2010 Tom Lane 5.1.42-6 - Emit explicit error message if user tries to build RPM as root -Related: #558915 +Related: #558915 * Wed Jan 20 2010 Tom Lane 5.1.42-5 - Correct Source0: tag and comment to reflect how to get the tarball * Fri Jan 8 2010 Tom Lane 5.1.42-4 - Disable symbolic links by default in /etc/my.cnf -Resolves: #553652 +Resolves: #553652 * Tue Jan 5 2010 Tom Lane 5.1.42-3 - Remove static libraries (.a files) from package, per packaging guidelines @@ -2285,25 +2266,25 @@ Resolves: #553652 - Update to MySQL 5.1.42, for various fixes described at http://dev.mysql.com/doc/refman/5.1/en/news-5-1-42.html - Start mysqld_safe with --basedir=/usr, to avoid unwanted SELinux messages -Resolves: #547485 +Resolves: #547485 * Thu Dec 17 2009 Tom Lane 5.1.41-2 - Stop waiting during "service mysqld start" if mysqld_safe exits -Resolves: #544095 +Resolves: #544095 * Mon Nov 23 2009 Tom Lane 5.1.41-1 - Update to MySQL 5.1.41, for various fixes described at http://dev.mysql.com/doc/refman/5.1/en/news-5-1-41.html including fixes for CVE-2009-4019 -Related: #540906 +Related: #540906 - Don't set old_passwords=1; we aren't being bug-compatible with 3.23 anymore -Resolves: #540735 +Resolves: #540735 * Tue Nov 10 2009 Tom Lane 5.1.40-1 - Update to MySQL 5.1.40, for various fixes described at http://dev.mysql.com/doc/refman/5.1/en/news-5-1-40.html - Do not force the --log-error setting in mysqld init script -Resolves: #533736 +Resolves: #533736 * Sat Oct 17 2009 Tom Lane 5.1.39-4 - Replace kluge fix for ndbd sparc crash with a real fix (mysql bug 48132) @@ -2311,7 +2292,7 @@ Resolves: #533736 * Thu Oct 15 2009 Tom Lane 5.1.39-3 - Work around two different compiler bugs on sparc, one by backing off optimization from -O2 to -O1, and the other with a klugy patch -Related: #529298, #529299 +Related: #529298, #529299 - Clean up bogosity in multilib stub header support: ia64 should not be listed (it's not multilib), sparc and sparc64 should be @@ -2353,7 +2334,7 @@ Related: #529298, #529299 - Update to MySQL 5.1.35, for various fixes described at http://dev.mysql.com/doc/refman/5.1/en/news-5-1-35.html - Ensure that /var/lib/mysql is created with the right SELinux context -Resolves: #502966 +Resolves: #502966 * Fri May 15 2009 Tom Lane 5.1.34-1 - Update to MySQL 5.1.34, for various fixes described at @@ -2362,12 +2343,12 @@ Resolves: #502966 * Wed Apr 15 2009 Tom Lane 5.1.33-2 - Increase stack size of ndbd threads for safety's sake. -Related: #494631 +Related: #494631 * Tue Apr 7 2009 Tom Lane 5.1.33-1 - Update to MySQL 5.1.33. - Disable use of pthread_setschedparam; doesn't work the way code expects. -Related: #477624 +Related: #477624 * Wed Mar 4 2009 Tom Lane 5.1.32-1 - Update to MySQL 5.1.32. @@ -2390,7 +2371,7 @@ Related: #477624 * Wed Oct 1 2008 Tom Lane 5.0.67-2 - Build the "embedded server" library, and package it in a new sub-RPM mysql-embedded, along with mysql-embedded-devel for devel support files. -Resolves: #149829 +Resolves: #149829 * Sat Aug 23 2008 Tom Lane 5.0.67-1 - Update to mysql version 5.0.67 @@ -2399,13 +2380,13 @@ Resolves: #149829 * Sun Jul 27 2008 Tom Lane 5.0.51a-2 - Enable ndbcluster support -Resolves: #163758 +Resolves: #163758 - Suppress odd crash messages during package build, caused by trying to build dbug manual (which we don't install anyway) with dbug disabled -Resolves: #437053 +Resolves: #437053 - Improve mysql.init to pass configured datadir to mysql_install_db, and to force user=mysql for both mysql_install_db and mysqld_safe. -Related: #450178 +Related: #450178 * Mon Mar 3 2008 Tom Lane 5.0.51a-1 - Update to mysql version 5.0.51a @@ -2413,7 +2394,7 @@ Related: #450178 * Mon Mar 3 2008 Tom Lane 5.0.45-11 - Fix mysql-stack-guard patch to work correctly on IA64 - Fix mysql.init to wait correctly when socket is not in default place -Related: #435494 +Related: #435494 * Mon Mar 03 2008 Dennis Gilmore 5.0.45-10 - add sparc64 to 64 bit arches for test suite checking @@ -2424,7 +2405,7 @@ Related: #435494 issue is that the buildfarm machines were moved to RHEL5, which uses 64K not 4K pages on PPC, and because RHEL5 takes the guard area out of the requested thread stack size we no longer had enough headroom. -Related: #435337 +Related: #435337 * Tue Feb 19 2008 Fedora Release Engineering - 5.0.45-8 - Autorebuild for GCC 4.3 @@ -2436,7 +2417,7 @@ Related: #435337 * Thu Dec 13 2007 Tom Lane 5.0.45-6 - Back-port upstream fixes for CVE-2007-5925, CVE-2007-5969, CVE-2007-6303. -Related: #422211 +Related: #422211 * Wed Dec 5 2007 Tom Lane 5.0.45-5 - Rebuild for new openssl @@ -2454,45 +2435,45 @@ Related: #422211 * Sun Jul 22 2007 Tom Lane 5.0.45-1 - Update to MySQL 5.0.45 -Resolves: #246535 +Resolves: #246535 - Move mysql_config's man page to base package -Resolves: #245770 +Resolves: #245770 - move my_print_defaults to base RPM, for consistency with Stacks packaging - mysql user is no longer deleted at RPM uninstall -Resolves: #241912 +Resolves: #241912 * Thu Mar 29 2007 Tom Lane 5.0.37-2 - Use a less hacky method of getting default values in initscript -Related: #233771, #194596 +Related: #233771, #194596 - Improve packaging of mysql-libs per suggestions from Remi Collet -Resolves: #233731 +Resolves: #233731 - Update default /etc/my.cnf ([mysql.server] has been bogus for a long time) * Mon Mar 12 2007 Tom Lane 5.0.37-1 - Update to MySQL 5.0.37 -Resolves: #231838 +Resolves: #231838 - Put client library into a separate mysql-libs RPM to reduce dependencies -Resolves: #205630 +Resolves: #205630 * Fri Feb 9 2007 Tom Lane 5.0.33-1 - Update to MySQL 5.0.33 - Install band-aid fix for "view" regression test designed to fail after 2006 - Don't chmod -R the entire database directory tree on every startup -Related: #221085 +Related: #221085 - Fix unsafe use of install-info -Resolves: #223713 +Resolves: #223713 - Cope with new automake in F7 -Resolves: #224171 +Resolves: #224171 * Thu Nov 9 2006 Tom Lane 5.0.27-1 - Update to MySQL 5.0.27 (see CVE-2006-4031, CVE-2006-4226, CVE-2006-4227) -Resolves: #202247, #202675, #203427, #203428, #203432, #203434, #208641 +Resolves: #202247, #202675, #203427, #203428, #203432, #203434, #208641 - Fix init script to return status 1 on server start timeout -Resolves: #203910 +Resolves: #203910 - Move mysqldumpslow from base package to mysql-server -Resolves: #193559 +Resolves: #193559 - Adjust link options for BDB module -Resolves: #199368 +Resolves: #199368 * Wed Jul 12 2006 Jesse Keating - 5.0.22-2.1 - rebuild diff --git a/rh-skipped-tests-list-base.list b/rh-skipped-tests-list-base.list index 65e5064..3588a84 100644 --- a/rh-skipped-tests-list-base.list +++ b/rh-skipped-tests-list-base.list @@ -44,3 +44,17 @@ main.archive_plugin : BUG#0 main.blackhole_plugin : BUG#0 main.events_read_only : 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 diff --git a/rh-skipped-tests-list-s390.list b/rh-skipped-tests-list-s390.list index 064d587..c482183 100644 --- a/rh-skipped-tests-list-s390.list +++ b/rh-skipped-tests-list-s390.list @@ -7,3 +7,16 @@ main.subquery_sj_all_bka_nobnl : BUG#0 # Fails since 8.0.41 main.archive : 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 -- Gitee From 42d617d81b9a764e24f5bbe78bc0a28b0a8407f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=BD=AC=E7=90=9B?= Date: Thu, 23 Dec 2021 12:09:22 +0000 Subject: [PATCH 2/4] !1 build fix mysql * spec : fix build --- mysql.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/mysql.spec b/mysql.spec index ee1054b..66555a6 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 # SCL stuff %{?scl:%scl_package mysql} %{!?scl:%global pkg_name %{name}} @@ -14,7 +15,7 @@ ExcludeArch: %{ix86} %{!?runselftest:%global runselftest 1} # Set this to 1 to see which tests fail, but 0 on production ready build -%{!?check_testsuite:%global ignore_testsuite_result 0} +%global ignore_testsuite_result 0 # 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 @@ -146,11 +147,11 @@ ExcludeArch: %{ix86} %global scl_upper %{lua:print(string.upper(string.gsub(rpm.expand("%{scl}"), "-", "_")))} %endif -Name: %{?scl_prefix}mysql -Version: 8.0.43 -Release: 1%{?with_debug:.debug}%{?dist} -Summary: MySQL client programs and shared libraries -URL: http://www.mysql.com +Name: %{?scl_prefix}mysql +Version: 8.0.43 +Release: 1%{anolis_release}%{?with_debug:.debug}%{?dist} +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 @@ -1206,6 +1207,10 @@ fi %endif %changelog +* Fri Oct 10 2025 zhangbinchen - 8.0.43-1.0.1 +- remove check_testsuite +- redefine ignore_testsuite_result + * Wed Aug 06 2025 Pavol Sloboda - 8.0.43-1 - Rebase to MySQL 8.0.43 -- Gitee From 9e3ed44d900465a96d1868a04c6b4115e11b991b Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Tue, 9 Nov 2021 19:52:16 +0800 Subject: [PATCH 3/4] build: support loongarch64 platform Signed-off-by: Liwei Ge --- 1000-anolis-mysql-support-loongarch64.patch | 14 ++++++++++++++ mysql.spec | 18 ++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 1000-anolis-mysql-support-loongarch64.patch diff --git a/1000-anolis-mysql-support-loongarch64.patch b/1000-anolis-mysql-support-loongarch64.patch new file mode 100644 index 0000000..0d80cb8 --- /dev/null +++ b/1000-anolis-mysql-support-loongarch64.patch @@ -0,0 +1,14 @@ +diff --git a/boost/boost_1_77_0/boost/predef/other/endian.h b/boost/boost_1_73_0/boost/predef/other/endian.h +index b42da538..8cd0a508 100644 +--- a/boost/boost_1_77_0/boost/predef/other/endian.h ++++ b/boost/boost_1_77_0/boost/predef/other/endian.h +@@ -125,7 +125,8 @@ information and acquired knowledge: + defined(__MIPSEL) || \ + defined(__MIPSEL__) || \ + defined(__riscv) || \ +- defined(__e2k__) ++ defined(__e2k__) || \ ++ defined(__loongarch__) + # undef BOOST_ENDIAN_LITTLE_BYTE + # define BOOST_ENDIAN_LITTLE_BYTE BOOST_VERSION_NUMBER_AVAILABLE + # endif diff --git a/mysql.spec b/mysql.spec index 66555a6..ccb6e4f 100644 --- a/mysql.spec +++ b/mysql.spec @@ -223,6 +223,21 @@ BuildRequires: %{?scl_prefix}lz4-devel BuildRequires: %{?scl_prefix}mecab-devel BuildRequires: %{?scl_prefix}bison BuildRequires: %{?scl_prefix}libcurl-devel + +Patch1000: 1000-anolis-mysql-support-loongarch64.patch + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: libaio-devel +BuildRequires: libedit-devel +BuildRequires: libevent-devel +BuildRequires: libicu-devel +BuildRequires: %{?scl_prefix}lz4 +BuildRequires: %{?scl_prefix}lz4-devel +BuildRequires: %{?scl_prefix}mecab-devel +BuildRequires: %{?scl_prefix}bison +BuildRequires: %{?scl_prefix}libcurl-devel +>>>>>>> 7832373 (build: support loongarch64 platform) %ifnarch aarch64 %{arm} s390 s390x BuildRequires: numactl-devel %endif @@ -523,6 +538,8 @@ the MySQL sources. %patch55 -p1 %patch126 -p1 +%patch1000 -p1 + # Patch Boost pushd boost/boost_$(echo %{boost_bundled_version}| tr . _) %patch111 -p1 @@ -1210,6 +1227,7 @@ fi * Fri Oct 10 2025 zhangbinchen - 8.0.43-1.0.1 - remove check_testsuite - redefine ignore_testsuite_result +- Support loongarch64 platform (liwei.glw@openanolis.org) * Wed Aug 06 2025 Pavol Sloboda - 8.0.43-1 - Rebase to MySQL 8.0.43 -- Gitee From 4402d4e888b13c1183802dc9d9b4cf55f96cac83 Mon Sep 17 00:00:00 2001 From: Bo Ren Date: Fri, 19 May 2023 14:07:46 +0800 Subject: [PATCH 4/4] fix test failure Signed-off-by: Bo Ren --- ...-fix-derived-condition-pushdown-test.patch | 22 +++++++++++++++++ ...have_32bits_time-test-on-loongarch64.patch | 11 +++++++++ ...-loaddata-special-test-for-loongarch.patch | 24 +++++++++++++++++++ mysql.spec | 13 +++++++++- 4 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 1001-fix-derived-condition-pushdown-test.patch create mode 100644 1002-skip-have_32bits_time-test-on-loongarch64.patch create mode 100644 1003-fix-loaddata-special-test-for-loongarch.patch diff --git a/1001-fix-derived-condition-pushdown-test.patch b/1001-fix-derived-condition-pushdown-test.patch new file mode 100644 index 0000000..c9e0414 --- /dev/null +++ b/1001-fix-derived-condition-pushdown-test.patch @@ -0,0 +1,22 @@ +--- mysql-test/t/derived_condition_pushdown.test.orig 2023-05-19 15:10:36.491463748 +0800 ++++ mysql-test/t/derived_condition_pushdown.test 2023-05-19 15:13:37.235839144 +0800 +@@ -1312,7 +1312,7 @@ + --skip_if_hypergraph # Depends on the query plan. + eval EXECUTE stmt USING @a, @b; + SET @a = 2; +-SET @b = '2023-05-06 16:49:45'; ++SET @b = '2033-05-06 16:49:45'; + SET timestamp=UNIX_TIMESTAMP('2023-05-06 16:49:45'); + --replace_regex $elide_costs + --skip_if_hypergraph # Depends on the query plan. +--- mysql-test/r/derived_condition_pushdown.result.orig 2023-05-19 13:53:02.848129213 +0800 ++++ mysql-test/r/derived_condition_pushdown.result 2023-05-19 15:13:15.712675361 +0800 +@@ -2110,7 +2110,7 @@ + -> Zero rows (no matching row in const table) (rows=0) + + SET @a = 2; +-SET @b = '2023-05-06 16:49:45'; ++SET @b = '2033-05-06 16:49:45'; + SET timestamp=UNIX_TIMESTAMP('2023-05-06 16:49:45'); + EXECUTE stmt USING @a, @b; + EXPLAIN diff --git a/1002-skip-have_32bits_time-test-on-loongarch64.patch b/1002-skip-have_32bits_time-test-on-loongarch64.patch new file mode 100644 index 0000000..eecf4f4 --- /dev/null +++ b/1002-skip-have_32bits_time-test-on-loongarch64.patch @@ -0,0 +1,11 @@ +--- mysql-8.0.32/mysql-test/include/have_32bits_time.inc 2022-12-16 23:34:44.000000000 +0800 ++++ mysql-8.0.32/mysql-test/include/have_32bits_time.inc.new 2023-05-19 22:46:34.731475815 +0800 +@@ -2,7 +2,7 @@ + + let $have_64bit = `SELECT @@version_compile_machine IN + ('x86_64', 'amd64', 'sparc', 'sparc64', 'arm64', 'aarch64', +- 'ppc64', 'ppc64le', 's390x')`; ++ 'loongarch64', 'ppc64', 'ppc64le', 's390x')`; + if ($have_64bit) { + --skip Doesn't support 32 bits UNIX time, only 64 bits + } diff --git a/1003-fix-loaddata-special-test-for-loongarch.patch b/1003-fix-loaddata-special-test-for-loongarch.patch new file mode 100644 index 0000000..308aa99 --- /dev/null +++ b/1003-fix-loaddata-special-test-for-loongarch.patch @@ -0,0 +1,24 @@ +--- mysql-test/t/loaddata_special.test.orig 2023-05-20 11:42:30.956908281 +0800 ++++ mysql-test/t/loaddata_special.test 2023-05-22 10:38:18.345995071 +0800 +@@ -13,7 +13,7 @@ + SET GLOBAL net_buffer_length = 1024; + SET GLOBAL max_allowed_packet = 1024; + connect (con2,localhost,root,,); # Makes max_allowed_packet take effect, globally. +-select load_file("/proc/modules"); ++select load_file("/proc/crypto"); + connection default; + SET GLOBAL max_allowed_packet = @old_max_allowed_packet; + SET GLOBAL net_buffer_length = @old_net_buffer_length; +--- mysql-test/r/loaddata_special.result.orig 2023-05-20 10:05:30.205788721 +0800 ++++ mysql-test/r/loaddata_special.result 2023-05-22 10:39:16.085415447 +0800 +@@ -6,8 +6,8 @@ + SET @old_max_allowed_packet= @@global.max_allowed_packet; + SET GLOBAL net_buffer_length = 1024; + SET GLOBAL max_allowed_packet = 1024; +-select load_file("/proc/modules"); +-load_file("/proc/modules") ++select load_file("/proc/crypto"); ++load_file("/proc/crypto") + NULL + Warnings: + Warning 1301 Result of load_file() was larger than max_allowed_packet (1024) - truncated diff --git a/mysql.spec b/mysql.spec index ccb6e4f..ca174f5 100644 --- a/mysql.spec +++ b/mysql.spec @@ -225,6 +225,9 @@ BuildRequires: %{?scl_prefix}bison BuildRequires: %{?scl_prefix}libcurl-devel Patch1000: 1000-anolis-mysql-support-loongarch64.patch +Patch1001: 1001-fix-derived-condition-pushdown-test.patch +Patch1002: 1002-skip-have_32bits_time-test-on-loongarch64.patch +Patch1003: 1003-fix-loaddata-special-test-for-loongarch.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -237,7 +240,6 @@ BuildRequires: %{?scl_prefix}lz4-devel BuildRequires: %{?scl_prefix}mecab-devel BuildRequires: %{?scl_prefix}bison BuildRequires: %{?scl_prefix}libcurl-devel ->>>>>>> 7832373 (build: support loongarch64 platform) %ifnarch aarch64 %{arm} s390 s390x BuildRequires: numactl-devel %endif @@ -539,6 +541,12 @@ the MySQL sources. %patch126 -p1 %patch1000 -p1 +%patch1001 -p0 +%patch1002 -p1 + +%ifarch loongarch64 +%patch1003 -p0 +%endif # Patch Boost pushd boost/boost_$(echo %{boost_bundled_version}| tr . _) @@ -1228,6 +1236,9 @@ fi - remove check_testsuite - redefine ignore_testsuite_result - Support loongarch64 platform (liwei.glw@openanolis.org) +- skip have_32bits_time test on loongarch64 (liwei.glw@openanolis.org) +- fix main.derived_condition_pushdown test (rb01097748@alibaba-inc.com) +- fix loaddata_special test for loongarch64 (rb01097748@alibaba-inc.com) * Wed Aug 06 2025 Pavol Sloboda - 8.0.43-1 - Rebase to MySQL 8.0.43 -- Gitee