mysql8.4

Author	SHA1	Message	Date
Michal Schorm	94bff62cd6	[2/2] Testsuite verification for 8.4.9 Adding the rest of skipped tests specific to C10S, RHEL 10 Konflux, or both.	2026-05-15 14:19:12 +02:00
Michal Schorm	b902c8209b	[1/2] Testsuite verification for 8.4.9 Skip 8 InnoDB compressed table tests on s390x: innodb.zlob_geom, innodb_zip.{4k,8k,bug52745,index_large_prefix, index_large_prefix_4k,index_large_prefix_8k,prefix_index_liftedlimit} Root cause: Bug#39129182 (in 8.0.46/8.4.9/9.7.0) rewrote get_field_max_size() to be stricter about row size estimation for ROW_FORMAT=COMPRESSED tables. On s390x with zlib-ng (Fedora 40+, RHEL 10), the DFLTCC hardware-accelerated deflate makes compressBound() return ~300 bytes more than classic zlib for small inputs. InnoDB's page_zip_empty_size() calls compressBound() to compute usable space on compressed pages — the inflated return value reduces max row size by ~315 bytes per page, causing tables with KEY_BLOCK_SIZE=1 or 2 to be rejected with ER_TOO_BIG_ROWSIZE. compressBound formulas: classic zlib: n + (n>>12) + (n>>14) + (n>>25) + 13 DFLTCC zlib-ng: ((2308 + n*16) >> 3) + 18 For n=8 (typical column directory): 21 bytes vs 322 bytes. Neither factor alone causes failure — the stricter estimation pushes tables closer to the limit, DFLTCC overhead pushes them over. x86_64 is unaffected (no DFLTCC). Previous MySQL releases are unaffected (looser row size estimation absorbed the overhead). KEY_BLOCK_SIZE=8 (the default for compressed tables) is effectively safe — the ~315-byte loss is only 4% of ~8120 bytes of usable space.	2026-05-15 14:16:07 +02:00
Michal Schorm	bde8c91075	Rebase to 8.4.9 Upstream release notes: https://dev.mysql.com/doc/relnotes/mysql/8.4/en/news-8-4-9.html Resolves: RHEL-170598	2026-05-13 02:30:50 +02:00
Michal Schorm	17687c7d06	[tmpfiles.d] Fixup of the tmpfile.d rules Each line must begin with a valid prefix (type) https://www.man7.org/linux/man-pages/man5/tmpfiles.d.5.html	2026-02-24 13:20:21 +01:00
Michal Schorm	217fb53fc4	[tmpfiles.d] Fixup of the tmpfile.d rules A comment is misisng a comment line prefix	2026-02-24 13:19:58 +01:00
Nikola Davidova	bdf88f920b	Extend tmpfiles.d rules for ImageMode After switching to a container image with bootc switch, systemd failed to start mysqld because required runtime directories were missing or had wrong permissions. Adding tmpfiles entries with correct ownership ensures systemd creates the necessary directories at boot and gives them correct permissions, allowing the mysql daemon to start. "In a container build, you can write to '/var'. However, this will have a semantic similar to a Dockerfile VOLUME instruction; the content from the container image is only copied at initial install time. Any subsequent system updates will not by default see new changes. It's recommended instead to use e.g. systemd tmpfiles.d as a way to ensure that newly added state "reconciles" across upgrades as desired." https://docs.fedoraproject.org/en-US/bootc/filesystem/#_filesystem_bind_mount_var This covers all the files in /var sicne we only ship these as can be seen here: find \| grep /var/ ./mysql8.4-server-8.4.5-1.fc43.x86_64.rpm/var/lib ./mysql8.4-server-8.4.5-1.fc43.x86_64.rpm/var/lib/mysql ./mysql8.4-server-8.4.5-1.fc43.x86_64.rpm/var/lib/mysql-files ./mysql8.4-server-8.4.5-1.fc43.x86_64.rpm/var/lib/mysql-keyring ./mysql8.4-server-8.4.5-1.fc43.x86_64.rpm/var/log ./mysql8.4-server-8.4.5-1.fc43.x86_64.rpm/var/log/mysql The '/usr' directory is not persistent therefore this change does not affect it and the '/etc' directory is merged in a different way and also not under the 'mysql:mysql' user	2026-02-24 13:19:48 +01:00
Lukas Javorsky	2d6d1bf1c4	Revert to soft static allocation of MariaDB and MySQL sysusers.d files Resolves: RHEL-119789 Related PR for `setup` RPM: https://src.fedoraproject.org/rpms/setup/pull-request/30 Partially reverts commit: 646e37c The MariaDB and MySQL sysusers.d files has to use soft static allocation in order to correctly handle the MariaDB PAM v2 plugin which utilizes setuid-to-root binary "/usr/lib64/mariadb/plugin/auth_pam_tool_dir/auth_pam_tool".	2026-02-24 13:19:18 +01:00
Michal Schorm	dcfa29f64f	Rebase to 8.4.8 Release notes: https://dev.mysql.com/doc/relnotes/mysql/8.4/en/news-8-4-8.html Resolves: RHEL-148486	2026-02-12 16:07:53 +01:00
Veronika Doubkova	95036b880d	Skip tests that are failing on Konflux Resolves: ROK-831	2025-12-09 14:12:43 +01:00
Michal Schorm	6df108e73d	Rebase to MySQL 8.4.7 -- Testsuite results for the 8.4.7 release verified There were some failing tests: \| auth_sec.admin_channel_tls \| auth_sec.admin_channel_tls_startup \| auth_sec.cert_verify \| auth_sec.cert_verify_openssl \| x.mysqlxtest_mode_ssl \| x.mysqlxtest_mode_ssl_unixsocket and all of them fail because the test certificates in the 'std_data' testsuite directory have expired. Some of those tests fail gracefuly, some not. But all of them produce variant of this error message: "Server SSL certificate doesn't verify: certificate has expired" -- I believe this is a recuring timebomb bug in MySQL. I found this upstream commit dealing with the issue few years ago: `8c22b5f6df` but this time different certificates needs refreshing, e.g.: \| std_data/server-cert-verify-fail.pem \| std_data/server-cert-verify-pass.pem and maybe some more. -- Resolves: RHEL-128143	2025-11-20 09:04:12 +01:00
Vaclav Danek	93df896049	updated plans to handle multiple plans	2025-09-17 08:33:22 +02:00
Vaclav Danek	efe7783b29	fixed plan path	2025-09-17 08:09:45 +02:00
Vaclav Danek	df9905f8d5	updated gating	2025-09-16 22:39:51 +02:00
Pavol Sloboda	670b865cb2	[bugfix] Fix packaging of the default MySQL server log We've received a bug report, that the 'rpm -qc' incorrectly returns the MySQL server default log file '/var/log/mysql/mysqld.log' as a configuration file. https://issues.redhat.com/browse/RHEL-57601 This was caused by us packing it in the SPECfile '%files' section with the '%config %ghost' directives. The reason was historical. We tried to mark the file as owned by the package, but at the same time to not pack it, and also prevent its deleteion on package removal. The correct way is to not list the file at all. The parent directory is properly packed and owned instead (already), so it should be clear that the files inside are associated with that package. This is how we already do it with the DB datadir '/var/lib/mysql'. Resolves: RHEL-112386 While investigating this issue, we also reviewed the log file creation. The log file is created automatically by the MySQL server when needed. This can even happen in the middle of the server runtime, when the file is (re)moved, and the DB server is tasked to flush the logs. I checked the MySQL server documentation, and tested it, and I found, that the logfile is indeed created by the server. The only possible reason why the file might be needed to be created beforehand, is when the file lies on a location to which the MySQL server won't have permissions to write to. This is likely the case of MySQL upstream RPMs, which place it by default to the '/var/log': `96d58aa2b9/packaging/rpm-fedora/mysql.spec.in (L703)` However Fedora and RHEL uses a designated directory '/var/log/mysql', which is owened by 'mysql:mysql', so the issue does not exists here.	2025-09-02 14:27:26 +02:00
Michal Schorm	a094014ba0	[Licenses] Review of the package licenses The project contains tens of thousands mentions in various formats of various licenses in various formats. I did what I could, but there certainly is a space for improvement. I hope the following description of my steps may serve as a solid justification of my findings. =========== =========== =========== =========== =========== =========== GPL & LGPL There is a difference between "GPL-2.0-only" and "GPL-2.0-or-later" https://spdx.org/licenses/GPL-2.0-only.html https://spdx.org/licenses/GPL-2.0-or-later.html I understood that the license text is identical (I've ran 'diff' on top of them to verify) and the difference is decided by the license header present in the files containing the code itself. This "-only" and "-or-later" differenciation simmilar in other versions of GPL and LGLP I like GREP. SO here we go: \# This command is supposed to: \# - find all occurrences of the string "Public License" \# - prefixed by "GNU", "Lesser", "Library", "General", each word is optional (to match both GPL and LGPL and all variants of how people write them) \# - while every word can have any number of any white characters - including newlines - between them (to match text wrapped between lines) \# - all of that followed by string "version" (to only match text mentioning the specific version) \# - with any characters between the first part and the "version" string \# - followed by a digit (to exclude any result not talking about a concrete version specifically, e.g. text around string "from time to time" in the GPL licenses) \# - match 3 more characters (so we catch the whole version number) \# - but the "version" string and number must occur no later than any dot "." or double newline (to only match text inside the license texts or license headers, but not code) \# Once found, \# - and match everything until dot or double newline (for further parsing of the strings "or later" etc) \# - replace any newline with space (" "), so the whole above match (as well s everything else) is put on a single line \# - replace string in the variable DIR_NAME with the same string prepended by newline, so each result is on a separate line ❯ export DIR_NAME="mysql-8.4.6" ❯ export TMPFILE=$(mktemp) ❯ grep -Pzoi '(?s)((GNU\s)?(Lesser\s)?(Library\s)?(General\s)?Public\sLicense)(?:(?!\.\n\|\n\n).)?version\s\d[\s\S]{0,3}(?:(?!\.\n\|\n\n).)' -r "${DIR_NAME}" \| sed ':a;N;$!ba;s/\n/ /g' \| sed "s\|${DIR_NAME}/\|\n${DIR_NAME}/\|g" > ${TMPFILE} The resulting file contains 17894 results. =========== =========== =========== ❯ cat ${TMPFILE} \| grep -i --binary-files=text "version 3" \| tee >(wc -l) retuns 10 results, from which: ❯ cat ${TMPFILE} \| grep -i --binary-files=text "version 3" \| grep -i --binary-files=text -e " lesser" -e " library" \| tee >(wc -l) 0 is LGPL and ❯ cat ${TMPFILE} \| grep -i --binary-files=text "version 3" \| grep -v -i --binary-files=text -e " lesser" -e " library" \| tee >(wc -l) 10 is GPL and ❯ cat ${TMPFILE} \| grep -i --binary-files=text "version 3" \| grep -i --binary-files=text -e "later" -e " or" \| tee >(wc -l) 10 results "GPL-3.0-or-later" and ❯ cat ${TMPFILE} \| grep -i --binary-files=text "version 3" \| grep -i --binary-files=text -e "later" -e " or" \| tee >(wc -l) 0 results "GPL-3.0-only" =========== =========== =========== ❯ cat ${TMPFILE} \| grep -i --binary-files=text "version 2" \| tee >(wc -l) retuns 17879 results, from which: ❯ cat ${TMPFILE} \| grep -i --binary-files=text "version 2" \| grep -i --binary-files=text -e " lesser" -e " library" \| tee >(wc -l) 15 is LGPL and ❯ cat ${TMPFILE} \| grep -i --binary-files=text "version 2" \| grep -v -i --binary-files=text -e " lesser" -e " library" \| tee >(wc -l) 17864 is GPL and =========== =========== =========== ❯ cat ${TMPFILE} \| grep -i --binary-files=text -e "version 2" \| grep -i --binary-files=text -e " lesser" -e " library" \| grep -i --binary-files=text -e "version 2[ ,;\<]" -e "version 2.0" \| tee >(wc -l) 12 is LGPL 2.0 and ❯ cat ${TMPFILE} \| grep -i --binary-files=text "version 2" \| grep -i --binary-files=text -e " lesser" -e " library" \| grep -i --binary-files=text -e "version 2[ ,;\<]" -e "version 2.0" \| grep -i --binary-files=text -e "later" -e " or " \| tee >(wc -l) 0 is "LGPL-2.0-or-later" and ❯ cat ${TMPFILE} \| grep -i --binary-files=text "version 2" \| grep -i --binary-files=text -e " lesser" -e " library" \| grep -i --binary-files=text -e "version 2[ ,;\<]" -e "version 2.0" \| grep -v -i --binary-files=text -e "later" -e " or " \| tee >(wc -l) 12 is "LGPL-2.0-only" and ❯ cat ${TMPFILE} \| grep -i --binary-files=text "version 2" \| grep -i --binary-files=text -e " lesser" -e " library" \| grep -i --binary-files=text -e "version 2\.[^0]" \| tee >(wc -l) 3 is LGPL 2.1 and ❯ cat ${TMPFILE} \| grep -i --binary-files=text "version 2" \| grep -i --binary-files=text -e " lesser" -e " library" \| grep -i --binary-files=text -e "version 2\.[^0]" \| grep -i --binary-files=text -e "later" -e " or " \| tee >(wc -l) 2 is "LGPL-2.1-or-later" both findings are in the 'LICENSE' file. However that doesn't necessiraly interests me, as the 'LICENSE' file is a list of just potential licenses. and ❯ cat ${TMPFILE} \| grep -i --binary-files=text "version 2" \| grep -i --binary-files=text -e " lesser" -e " library" \| grep -i --binary-files=text -e "version 2\.[^0]" \| grep -v -i --binary-files=text -e "later" -e " or " \| tee >(wc -l) 1 is "LGPL-2.1-only" the finding is in the 'LICENSE' file. =========== =========== =========== ❯ cat ${TMPFILE} \| grep -i --binary-files=text "version 2" \| grep -v -i --binary-files=text -e " lesser" -e " library" \| grep -i --binary-files=text -e "version 2[ ,;\<]" -e "version 2.[0\s]" -e "version 2.\s" \| tee >(wc -l) 17862 is GPL 2.0 and ❯ cat ${TMPFILE} \| grep -i --binary-files=text "version 2" \| grep -v -i --binary-files=text -e " lesser" -e " library" \| grep -i --binary-files=text -e "version 2[ ,;\<]" -e "version 2.[0\s]" -e "version 2.\s" \| grep -i --binary-files=text -e "later" -e " or " \| tee >(wc -l) 33 is "GPL-2.0-or-later" found in: extra/gperftools/ extra/libbacktrace/ router/ and ❯ cat ${TMPFILE} \| grep -i --binary-files=text "version 2" \| grep -v -i --binary-files=text -e " lesser" -e " library" \| grep -i --binary-files=text -e "version 2[ ,;\<]" -e "version 2.[0\s]" -e "version 2.\s" \| grep -v -i --binary-files=text -e "later" -e " or " \| tee >(wc -l) 17829 is "GPL-2.0-only" ~190 unique files with the FOSS 1.0 exception ~9500 unique files without it and ❯ cat ${TMPFILE} \| grep -i --binary-files=text "version 2" \| grep -v -i --binary-files=text -e " lesser" -e " library" \| grep -i --binary-files=text -e "version 2\.[123456789]" \| tee >(wc -l) 2 GPL 2.1 weird ... GPL 2.1 doesn't exists, only LGPL 2.1 does and by examining the files, both are false positives, as the text matched was: "The OpenLDAP Public License Version 2.8, 17 August 2003" =========== =========== =========== These were the GPL-family licenses. =========== =========== =========== =========== =========== =========== Now I tired a search that omits any GPL-family license to see what remained. ❯ grep -i licens -r "${DIR_NAME}/" \| \ grep -v \ -e "// This source code is licensed under both the GPLv2 (found in the" \ -e "// COPYING file in the root directory) and Apache 2.0 License" \ -e "// (found in the LICENSE.Apache file in the root directory)." \ -e "// Use of this source code is governed by a BSD-style license that can be" \ -e "// found in the LICENSE file. See the AUTHORS file for names of contributors." \ -e "it under the terms of the GNU General Public License as published by" \ -e "the Free Software Foundation; version 2 of the License." \ -e "GNU General Public License for more details." \ -e "You should have received a copy of the GNU General Public License" \ -e "it under the terms of the GNU General Public License, version 2.0," \ -e "but not limited to OpenSSL) that is licensed under separate terms," \ -e "as designated in a particular file or component or in included license" \ -e "separately licensed software that they have included with MySQL." \ -e "GNU General Public License, version 2.0, for more details." \ -e "License as published by the Free Software Foundation; either" \ -e "version 2.1 of the License, or (at your option) any later version." \ -e "Lesser General Public License for more details." \ -e "License along with this library; if not, write to the Free Software" \ -e "License version 2.1 as published by the Free Software Foundation." \ -e "the terms of the GNU General Public License as published by the Free Software" \ -e "License along with this library; if not, write to the Free" \ -e "version 2 of the License, or (at your option) any later version." \ -e "Library General Public License for more details." \ -e "License along with this library; if not see <http://www.gnu.org/licenses>" \ -e "GNU General Public License, version 2.0" \ \| grep -i "licens" > ${TMPFILE} Which yelds 33132 results to go through. This is tremendously attention demanding, and likely place for oversights. I've managed to discover the following: =========== =========== =========== ❯ cat ${TMPFILE} \| grep -i -e "separately licensed software that they have either included with" \| wc -l 9347 This is the Universal-FOSS-exception-1.0. I had to check which licenses are these exceptions connected to. I found it connected to "GPL-2.0-only". Around 190 "GPL-2.0-only" licensed files have the exception, while around 9500 "LGPL-2.0-only" licensed files does not have it. I found that all "LGPL-2.0-only" license files also have the exception. =========== =========== =========== ❯ cat ${TMPFILE} \| grep -i -e "www.boost.org/LICENSE_" -e "See accompanying file LICENSE_1_0.txt" -e "Version 1.0. (See accompanying file" -e "accompanying file LICENSE_1_0.txt" -e "Boost Software License" -e "http://www.boost.org/users/license.html" \| wc -l 21337 The "BSL-1.0" license =========== =========== =========== ❯ cat ${TMPFILE} \| grep -i -e "apache license" mysql-8.4.6/storage/ndb/test/crund/src/META-INF/persistence.xml: to you under the Apache License, Version 2.0 (the mysql-8.4.6/storage/ndb/test/crund/src/META-INF/persistence.xml: http://www.apache.org/licenses/LICENSE-2.0 The "Apache-2.0" licnese =========== =========== =========== ❯ cat ${TMPFILE} \| grep -v -i -e "www.boost.org/LICENSE_" -e "See accompanying file LICENSE_1_0.txt" -e "Version 1.0. (See accompanying file" -e "accompanying file LICENSE_1_0.txt" -e "Boost Software License" -e "http://www.boost.org/users/license.html" \| grep -v -i -e "apache" \| grep -e "MIT" The "MIT" license =========== =========== =========== ❯ cat ${TMPFILE} \| grep -v -i -e "www.boost.org/LICENSE_" -e "See accompanying file LICENSE_1_0.txt" -e "Version 1.0. (See accompanying file" -e "accompanying file LICENSE_1_0.txt" -e "Boost Software License" -e "http://www.boost.org/users/license.html" \| grep -v -i -e "apache" \| grep -v -e "MIT" \| grep -e "BSD" The "BSD-2-Clause" License =========== =========== =========== ❯ cat ${TMPFILE} \| grep -v -i -e "www.boost.org/LICENSE_" -e "See accompanying file LICENSE_1_0.txt" -e "Version 1.0. (See accompanying file" -e "accompanying file LICENSE_1_0.txt" -e "Boost Software License" -e "http://www.boost.org/users/license.html" \| grep -v -i -e "apache" \| grep -v -e "MIT" \| grep -i -e "dual license" mysql-8.4.6/storage/innobase/ut/crc32.cc: Dual licensed under BSD license and GPLv2. The "( GPL-2.0-only OR BSD-2-Clause )" license =========== =========== =========== I hope I caught all of the licenses. If that's not the case, please contribute a fix or at least report a bug against this package so we can correct it. Related: RHEL-104250	2025-09-02 14:27:17 +02:00
Michal Schorm	b74fea14e5	[bugfix] Fix the 'Conflicts:' with MariaDB packages The package conflicts between MariaDB and MySQL packages are only set against the un-versioned names. (the un-versioned names are only provided by the distribution default version) The conflicts has to be extended to cover the '-any' virtually provided names, which are provided by all versions of the versioned packages. Related: RHEL-104250	2025-09-02 14:27:13 +02:00
Pavol Sloboda	221864b470	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	2025-09-02 14:27:10 +02:00
Michal Schorm	5501d7be55	[Fix for Fedora Change] Fix versioned layout macros - cover both arch and noarch sub-packages - add obsoletes against the older versions to the distribution default version Related: RHEL-104250	2025-09-02 14:27:06 +02:00
Pavol Sloboda	509086ab6f	Stopped removing the my_print_defaults when client is not built as it is required by the server subpackage thus removing it when the client subpackage is not being built will result in a build failure. Related: RHEL-104250	2025-09-02 14:27:03 +02:00
Pavol Sloboda	70be037a81	Removed the mysql_plugin from the rm command when building without -client subpackage as mysql_plugin is deprecated from version 5.7.11 and has been removed in version 8.0 therefore it is no longer provided by upstream and it caused build failures when rm could not find it. Related: RHEL-104250	2025-09-02 14:26:50 +02:00
Pavol Sloboda	1c7250b943	Rebase to 8.4.5 Upstream release notes: https://dev.mysql.com/doc/relnotes/mysql/8.4/en/news-8-4-5.html I have ran the extended testsuite during builds on f40-f43 on all architectures in 2 runs (that is 32 individual build logs parsed for the upcoming statistics) These are the statistics of the test results containing the number of times a test has failed and its name, the tests that fail because of a timeout are marked with `-- timed out`. Tests not marked with timeout failed on asserts. These tests are not added to the rh-skipped-test-lists-*.list. The results are split into all architectures together: 12 rpl.rpl_eventlog_psi_memory 12 rpl.rpl_channel_creation_under_replica_load 12 innodb_fts.optimize_big 11 innodb_fts.bug_34846823 -- timed out 10 perfschema.system_events_plugin 8 rpl_gtid.mysqldump_bug33630199 -- timed out 8 perfschema.system_events_component 7 sys_vars.myisam_data_pointer_size_func -- timed out 7 rpl.rpl_parallel_ddl_myisam 7 rpl.rpl_parallel_ddl_innodb 7 parts.partition_reverse_scan_icp -- timed out 7 innodb.multi_value_basic -- timed out 7 innodb.lob_recovery -- timed out 7 federated.federated_server -- timed out 5 rpl_gtid.rpl_perfschema_applier_status_by_worker_gtid_skipped_transaction_mts 3 perfschema.transaction_nested_events 3 innodb_undo.undo_settings 2 x.connection_not_alive 2 perfschema.relaylog The ppc64le architecture (since it had the most amount of failing tests by far and the same tests were failing there almost every time): 8 rpl.rpl_eventlog_psi_memory 8 rpl_gtid.mysqldump_bug33630199 -- timed out 7 sys_vars.myisam_data_pointer_size_func -- timed out 7 rpl.rpl_parallel_ddl_myisam 7 rpl.rpl_parallel_ddl_innodb 7 rpl.rpl_channel_creation_under_replica_load 7 perfschema.system_events_plugin 7 parts.partition_reverse_scan_icp -- timed out 7 innodb.multi_value_basic -- timed out 7 innodb.lob_recovery -- timed out 7 innodb_fts.optimize_big 7 innodb_fts.bug_34846823 -- timed out 7 federated.federated_server -- timed out 6 perfschema.system_events_component 4 rpl_gtid.rpl_perfschema_applier_status_by_worker_gtid_skipped_transaction_mts 2 innodb_undo.undo_settings And other architectures excluding ppc64le: 5 rpl.rpl_channel_creation_under_replica_load 5 innodb_fts.optimize_big 4 rpl.rpl_eventlog_psi_memory 4 innodb_fts.bug_34846823 -- timed out 3 perfschema.transaction_nested_events 3 perfschema.system_events_plugin 2 x.connection_not_alive 2 perfschema.system_events_component 2 perfschema.relaylog 1 rpl_gtid.rpl_perfschema_applier_status_by_worker_gtid_skipped_transaction_mts 1 innodb_undo.undo_settings Related: RHEL-87738	2025-09-02 13:50:41 +02:00
Michal Schorm	ce7a3be1da	Remove dependnecy on OpenSSL engines, which are deprecated in Fedora Related: RHEL-87738	2025-09-02 13:50:37 +02:00
Michal Schorm	111a259568	[enhancement] Use %global instead of %define The other occurences are functions that are called with various arguments through the SPECfile. I tried to replace them too, but the resulting logic did not expanded correcly and resulted in various FTI issues. Related: RHEL-87738	2025-09-02 13:50:30 +02:00
Michal Schorm	92973eb3c4	Update the license clarification text to reflect the current state Related: RHEL-87738	2025-09-02 13:49:22 +02:00

8 changed files with 159 additions and 8 deletions

1

.fmf/version Normal file

View File

				`@ -0,0 +1 @@`
				`1`

4

.gitignore vendored

View File

 @ -1 +1,3 @@
 mysql-8.4.9.tar.gz
 /*/
 /*.rpm
 /*.tar.gz

									
										120

boost-1.58.0-pool.patch
									
										Normal file
									
										View File
										
				@ -0,0 +1,120 @@

				Index: boost/pool/pool.hpp

				===================================================================

				--- boost/pool/pool.hpp	(revision 78317)

				+++ boost/pool/pool.hpp	(revision 78326)

				@@ -27,4 +27,6 @@

				 #include <boost/pool/poolfwd.hpp>

				+// std::numeric_limits

				+#include <boost/limits.hpp>

				 // boost::integer::static_lcm

				 #include <boost/integer/common_factor_ct.hpp>

				@@ -358,4 +360,11 @@

				     }

				+    size_type max_chunks() const

				+    { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool.

				+      size_type partition_size = alloc_size();

				+      size_type POD_size = integer::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);

				+      return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();

				+    }

				+

				     static void * & nextof(void * const ptr)

				     { //! \returns Pointer dereferenced.

				@@ -377,5 +388,7 @@

				       //!   the first time that object needs to allocate system memory.

				       //!   The default is 32. This parameter may not be 0.

				-      //! \param nmax_size is the maximum number of chunks to allocate in one block.

				+      //! \param nmax_size is the maximum number of chunks to allocate in one block.			

				+      set_next_size(nnext_size);

				+      set_max_size(nmax_size);

				     }

				@@ -400,7 +413,7 @@

				     }

				     void set_next_size(const size_type nnext_size)

				-    { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.

				-      //! \returns nnext_size.

				-      next_size = start_size = nnext_size;

				+    { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.     

				+      BOOST_USING_STD_MIN();

				+      next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks());

				     }

				     size_type get_max_size() const

				@@ -410,5 +423,6 @@

				     void set_max_size(const size_type nmax_size)

				     { //! Set max_size.

				-      max_size = nmax_size;

				+      BOOST_USING_STD_MIN();

				+      max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks());

				     }

				     size_type get_requested_size() const

				@@ -713,7 +727,7 @@

				   BOOST_USING_STD_MIN();

				   if(!max_size)

				-    next_size <<= 1;

				+    set_next_size(next_size << 1);

				   else if( next_size*partition_size/requested_size < max_size)

				-    next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);

				+    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));

				   //  initialize it,

				@@ -753,7 +767,7 @@

				   BOOST_USING_STD_MIN();

				   if(!max_size)

				-    next_size <<= 1;

				+    set_next_size(next_size << 1);

				   else if( next_size*partition_size/requested_size < max_size)

				-    next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);

				+    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));

				   //  initialize it,

				@@ -797,4 +811,6 @@

				   //! \returns Address of chunk n if allocated ok.

				   //! \returns 0 if not enough memory for n chunks.

				+  if (n > max_chunks())

				+    return 0;

				   const size_type partition_size = alloc_size();

				@@ -845,7 +861,7 @@

				   BOOST_USING_STD_MIN();

				   if(!max_size)

				-    next_size <<= 1;

				+    set_next_size(next_size << 1);

				   else if( next_size*partition_size/requested_size < max_size)

				-    next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);

				+    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));

				   //  insert it into the list,

				Index: libs/pool/test/test_bug_6701.cpp

				===================================================================

				--- libs/pool/test/test_bug_6701.cpp	(revision 78326)

				+++ libs/pool/test/test_bug_6701.cpp	(revision 78326)

				@@ -0,0 +1,27 @@

				+/* Copyright (C) 2012 Étienne Dupuis

				+* 

				+* Use, modification and distribution is subject to the 

				+* Boost Software License, Version 1.0. (See accompanying

				+* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)

				+*/

				+

				+// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701)

				+

				+#include <boost/pool/object_pool.hpp>

				+#include <boost/limits.hpp>

				+

				+int main()

				+{

				+  boost::pool<> p(1024, std::numeric_limits<size_t>::max() / 768);

				+

				+  void *x = p.malloc();

				+  BOOST_ASSERT(!x);

				+  

				+  BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_next_size());

				+  BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_max_size());

				+

				+  void *y = p.ordered_malloc(std::numeric_limits<size_t>::max() / 768);

				+  BOOST_ASSERT(!y);

				+

				+  return 0;

				+}

2

ci.fmf Normal file

View File

				`@ -0,0 +1,2 @@`
				`resultsdb-testcase: separate`

									
										6

gating.yaml
									
										Normal file
									
										View File
										
				@ -0,0 +1,6 @@

				--- !Policy

				product_versions:

				  - rhel-10

				decision_context: osci_compose_gate

				rules:

				  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/rhel-gating.functional}

									
										11

mysql8.4.spec
									
										View File
										
				@ -104,7 +104,7 @@ ExcludeArch: %{ix86}

				Name:             %{majorname}%{majorversion}

				Version:          %{package_version}

				Release:          1%{?with_debug:.debug}%{?dist}.alma.1

				Release:          1%{?with_debug:.debug}%{?dist}

				Summary:          MySQL client programs and shared libraries

				URL:              http://www.mysql.com

				@ -169,7 +169,7 @@ BuildRequires:    mecab-devel

				BuildRequires:    bison

				BuildRequires:    libzstd-devel

				BuildRequires:    libcurl-devel

				%ifnarch aarch64 s390x riscv64

				%ifnarch aarch64 s390x

				BuildRequires:    numactl-devel

				BuildRequires:    libquadmath-devel

				%endif

				@ -605,10 +605,10 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \

				         -DSYSTEMD_SERVICE_NAME="%{daemon_name}" \

				         -DSYSTEMD_PID_DIR="%{pidfiledir}" \

				         -DWITH_INNODB_MEMCACHED=ON \

				%ifnarch aarch64 s390x riscv64

				%ifnarch aarch64 s390x

				         -DWITH_NUMA=ON \

				%endif

				%ifarch s390x riscv64

				%ifarch s390x

				         -DUSE_LD_GOLD=OFF \

				%endif

				         -DWITH_ROUTER=OFF \

				@ -1146,9 +1146,6 @@ popd

				%endif

				%changelog

				* Tue May 26 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 8.4.9-1.alma.1

				- Add riscv64 support

				* Wed May 06 2026 Michal Schorm <mschorm@redhat.com> - 8.4.9-1

				- Rebase to 8.4.9

10

plans.fmf Normal file

View File

 @ -0,0 +1,10 @@
 /rhel-gating:
   plan:
     import:
       url: https://pkgs.devel.redhat.com/git/tests/mysql
       name: /plans/versioned/mysql84/gating
 /rhel-no-gating:
   plan:
     import:
       url: https://pkgs.devel.redhat.com/git/tests/mysql
       name: /plans/versioned/mysql84/no-gating

									
										13

rpminspect.yaml
									
										Normal file
									
										View File
										
				@ -0,0 +1,13 @@

				# Set up global ignore list

				ignore:

				    # mysql-test/ directory contains an extensive test-suite of about 20.000 files;

				    # It is very time consuming to be fully analysed and the results aren't useful anyway

				    # It is expected the tests change during rebases, as the underlying functionality the test evolve

				    # Some of the tests contain broken or problematic code, however that is on purpose

				    - /usr/share/mysql-test/

				badfuncs:

				  ignore:

				    # udf_example.so can be ignored, as it is an example of how to write loadable functions

				    # Loadable functions were formerly know as UDF (User Defined Functions).

				    - /usr/lib64/mysql/plugin/udf_example.so

Compare commits

24 Commits

a10 ... c10s

1

.fmf/version Normal file

View File

4

.gitignore vendored

View File

120

boost-1.58.0-pool.patch Normal file

View File

2

ci.fmf Normal file

View File

6

gating.yaml Normal file

View File

11

mysql8.4.spec

View File

10

plans.fmf Normal file

View File

13

rpminspect.yaml Normal file

View File

Compare commits

24 Commits a10 ... c10s

1 .fmf/version Normal file Unescape Escape View File

4 .gitignore vendored Unescape Escape View File

120 boost-1.58.0-pool.patch Normal file Unescape Escape View File

2 ci.fmf Normal file Unescape Escape View File

6 gating.yaml Normal file Unescape Escape View File

11 mysql8.4.spec Unescape Escape View File

10 plans.fmf Normal file Unescape Escape View File

13 rpminspect.yaml Normal file Unescape Escape View File

24 Commits

a10 ... c10s

1

.fmf/version Normal file

View File

4

.gitignore vendored

View File

120

boost-1.58.0-pool.patch Normal file

View File

2

ci.fmf Normal file

View File

6

gating.yaml Normal file

View File

11

mysql8.4.spec

View File

10

plans.fmf Normal file

View File

13

rpminspect.yaml Normal file

View File