From 564b0a7faee95628cfe8ac636f1690b900fe6e52 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 22 Feb 2024 08:20:20 +0000 Subject: [PATCH] import CS mysql-8.0.36-1.module_el8+857+dfdef1fc --- .gitignore | 2 +- .mysql.metadata | 2 +- SOURCES/mysql-arm32-timer.patch | 8 +++--- SOURCES/mysql-c99.patch | 12 +++++++++ SOURCES/mysql-mtr.patch | 10 ++++--- SOURCES/rh-skipped-tests-list-arm.list | 11 +++++--- SOURCES/rh-skipped-tests-list-base.list | 25 ++++++++++++++--- SOURCES/rh-skipped-tests-list-ppc.list | 17 +++--------- SOURCES/rh-skipped-tests-list-s390.list | 33 +++-------------------- SPECS/mysql.spec | 36 ++++++++++++++++++++----- 10 files changed, 91 insertions(+), 65 deletions(-) create mode 100644 SOURCES/mysql-c99.patch diff --git a/.gitignore b/.gitignore index 1df3cb2..1bb222a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mysql-boost-8.0.32.tar.gz +SOURCES/mysql-boost-8.0.36.tar.gz diff --git a/.mysql.metadata b/.mysql.metadata index 86debba..2efe297 100644 --- a/.mysql.metadata +++ b/.mysql.metadata @@ -1 +1 @@ -973c4cf495bceaa8387f675e528010c2eed20e97 SOURCES/mysql-boost-8.0.32.tar.gz +fdbf5b1b37a5d882643695593ca25d0a75eb69ed SOURCES/mysql-boost-8.0.36.tar.gz diff --git a/SOURCES/mysql-arm32-timer.patch b/SOURCES/mysql-arm32-timer.patch index d9c616c..bafa0bb 100644 --- a/SOURCES/mysql-arm32-timer.patch +++ b/SOURCES/mysql-arm32-timer.patch @@ -1,10 +1,10 @@ diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql -index eff14a67..413dfc27 100644 +index 78b09285..b7153445 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql -@@ -363,6 +363,11 @@ INSERT INTO global_suppressions VALUES - */ - ("Manifest file '.*' is not read-only. For better security, please make sure that the file is read-only."), +@@ -376,6 +376,11 @@ INSERT INTO global_suppressions VALUES + + ("'mysql_native_password' is deprecated and will be removed in a future release."), + /* + ARM32 don't support timers and get this warning in every test. diff --git a/SOURCES/mysql-c99.patch b/SOURCES/mysql-c99.patch new file mode 100644 index 0000000..935e64f --- /dev/null +++ b/SOURCES/mysql-c99.patch @@ -0,0 +1,12 @@ +diff -ur mysql-8.0.35.orig/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c mysql-8.0.35/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c +--- mysql-8.0.35.orig/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c 2023-10-12 13:45:01.000000000 +0200 ++++ mysql-8.0.35/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c 2023-12-19 10:48:46.718006624 +0100 +@@ -4070,7 +4070,7 @@ + do { + while(key_token->length != 0) { + /* whether there are more keys to fetch */ +- bool next_get = (key_token + 1)->value; ++ bool next_get = (key_token + 1)->value != NULL; + + key = key_token->value; + nkey = key_token->length; diff --git a/SOURCES/mysql-mtr.patch b/SOURCES/mysql-mtr.patch index 6f193b9..3bb6559 100644 --- a/SOURCES/mysql-mtr.patch +++ b/SOURCES/mysql-mtr.patch @@ -80,9 +80,11 @@ I'm not sure whether the output is synchronous, but even if it wasn'tit still lo ---- mysql-8.0.24/mysql-test/mysql-test-run.pl 2021-05-10 04:29:44.391897891 +0200 -+++ mysql-8.0.24/mysql-test/mysql-test-run.pl_patched 2021-05-10 04:38:51.031702753 +0200 -@@ -3374,17 +3374,6 @@ sub setup_vardir() { +diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl +index 26e6c92c..9d85c6d6 100755 +--- a/mysql-test/mysql-test-run.pl ++++ b/mysql-test/mysql-test-run.pl +@@ -3533,17 +3533,6 @@ sub setup_vardir() { mkpath("$opt_vardir/tmp"); mkpath($opt_tmpdir) if ($opt_tmpdir ne "$opt_vardir/tmp"); @@ -99,4 +101,4 @@ I'm not sure whether the output is synchronous, but even if it wasn'tit still lo - # Copy all files from std_data into var/std_data # and make them world readable - copytree("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data", "0022"); + copytree("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data", "0022") diff --git a/SOURCES/rh-skipped-tests-list-arm.list b/SOURCES/rh-skipped-tests-list-arm.list index 3fdfb1d..4a423e7 100644 --- a/SOURCES/rh-skipped-tests-list-arm.list +++ b/SOURCES/rh-skipped-tests-list-arm.list @@ -1,4 +1,9 @@ -sys_vars.innodb_buffer_pool_size_basic : BUG#0 -sys_vars.myisam_data_pointer_size_func : BUG#0 -perfschema.idx_threads : BUG#0 +# 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/SOURCES/rh-skipped-tests-list-base.list b/SOURCES/rh-skipped-tests-list-base.list index 4a03966..65e5064 100644 --- a/SOURCES/rh-skipped-tests-list-base.list +++ b/SOURCES/rh-skipped-tests-list-base.list @@ -19,11 +19,28 @@ main.mysqld--help-notwin : BUG#0 # Unstable since 8.0.27 innodb.innodb_read_only-2 : BUG#0 -# Failing since 8.0.29 -innodb.innochecksum_linux : BUG#0 -rpl_gtid.rpl_multi_source_mtr_includes : BUG#0 +# 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 -main.mysqlpump_bugs : 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.36 +main.generated_invisible_primary_key : BUG#0 +main.slow_log : BUG#0 +main.archive_plugin : BUG#0 +main.blackhole_plugin : BUG#0 +main.events_read_only : BUG#0 +main.log_backtrace : BUG#0 diff --git a/SOURCES/rh-skipped-tests-list-ppc.list b/SOURCES/rh-skipped-tests-list-ppc.list index e5b9cd8..579f9e7 100644 --- a/SOURCES/rh-skipped-tests-list-ppc.list +++ b/SOURCES/rh-skipped-tests-list-ppc.list @@ -1,14 +1,5 @@ -main.component_backup_lock_service : BUG#0 +# ppc64le +sys_vars.innodb_buffer_pool_size_basic : BUG#0 fails only on ppc64le on f32+ -# Fails since MySQL 8.0.30 -main.resource_group_thr_prio_unsupported : BUG#0 -main.resource_group_binlog_events : BUG#0 - -clone.local_dml_auto_tune : BUG#0 -clone.remote_dml_auto_tune : BUG#0 - -main.resource_group_binlog_events : BUG#0 -main.resource_group_thr_prio_unsupported : BUG#0 -rpl_gtid.rpl_mixed_temp_table_stored_function : BUG#0 -sys_vars.innodb_buffer_pool_size_basic : BUG#0 -x.resource_groups : BUG#0 +# Unstable on 8.0.35 +rpl.rpl_replica_terminology : BUG#0 diff --git a/SOURCES/rh-skipped-tests-list-s390.list b/SOURCES/rh-skipped-tests-list-s390.list index 2c89419..3a6668d 100644 --- a/SOURCES/rh-skipped-tests-list-s390.list +++ b/SOURCES/rh-skipped-tests-list-s390.list @@ -1,30 +1,5 @@ -auth_sec.keyring_file_data_qa : BUG#0 -gis.geometry_class_attri_prop : BUG#0 -gis.geometry_property_function_issimple : BUG#0 -gis.gis_bugs_crashes : BUG#0 -gis.spatial_analysis_functions_buffer : BUG#0 -gis.spatial_analysis_functions_centroid : BUG#0 -gis.spatial_analysis_functions_distance : BUG#0 -gis.spatial_operators_intersection : BUG#0 -gis.spatial_operators_symdifference : BUG#0 -gis.spatial_op_testingfunc_mix : BUG#0 -gis.spatial_utility_function_distance_sphere : BUG#0 -gis.spatial_utility_function_simplify : BUG#0 -main.derived_limit : BUG#0 -main.explain_tree : BUG#0 -main.gis-precise : BUG#0 -main.mysql_load_data_local_dir : BUG#0 -main.subquery_bugs : BUG#0 -main.subquery_sj_dupsweed : BUG#0 -main.subquery_sj_dupsweed_bka : BUG#0 -main.subquery_sj_dupsweed_bka_nobnl : BUG#0 -main.subquery_sj_firstmatch : BUG#0 -main.subquery_sj_firstmatch_bka : BUG#0 -main.subquery_sj_firstmatch_bka_nobnl : BUG#0 -main.subquery_sj_mat_bka_nobnl : BUG#0 -main.window_std_var : BUG#0 -main.window_std_var_optimized : BUG#0 +# Fails since 8.0.22 +main.subquery_bugs : BUG#0 -# Failing since 8.0.27 -gis.st_symdifference : BUG#0 -main.regular_expressions_utf-8 : BUG#0 +# Failing on C9S & RHEL 9 for MySQL release 8.0.33 +main.subquery_sj_all_bka_nobnl : BUG#0 diff --git a/SPECS/mysql.spec b/SPECS/mysql.spec index 2141d3c..4b25e83 100644 --- a/SPECS/mysql.spec +++ b/SPECS/mysql.spec @@ -2,6 +2,9 @@ %{?scl:%scl_package mysql} %{!?scl:%global pkg_name %{name}} +# To both save infrastrucutre resources and workaround testsuite clashes +ExcludeArch: %{ix86} + # Name of the package without any prefixes %global pkgnamepatch mysql @@ -16,7 +19,7 @@ # 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.32 +%global last_tested_version 8.0.36 # Set to 1 to force run the testsuite even if it was already tested in current version %global force_run_testsuite 0 @@ -83,9 +86,9 @@ %bcond_with bundled_zstd %bcond_with bundled_fido2 %endif -%global zstd_bundled_version 1.5.0 +%global zstd_bundled_version 1.5.5 %global libevent_bundled_version 2.1.11 -%global fido2_bundled_version 1.8.0 +%global fido2_bundled_version 1.13.0 # Include files for SysV init or systemd %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 @@ -144,7 +147,7 @@ %endif Name: %{?scl_prefix}mysql -Version: 8.0.32 +Version: 8.0.36 Release: 1%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com @@ -193,6 +196,7 @@ Patch5: %{pkgnamepatch}-paths.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 @@ -515,6 +519,7 @@ the MySQL sources. %patch51 -p1 %patch53 -p1 %patch54 -p1 +%patch55 -p1 %patch126 -p1 # Patch Boost @@ -736,7 +741,6 @@ install -p -m 644 scripts/mysql-scripts-common %{buildroot}%{_libexecdir}/mysql- install -D -p -m 0644 scripts/server.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/%{pkg_name}-server.cnf install -D -p -m 0644 %{SOURCE32} %{buildroot}%{_sysconfdir}/my.cnf.d/%{pkg_name}-default-authentication-plugin.cnf -rm %{buildroot}%{_infodir}/mysql.info* rm %{buildroot}%{_libdir}/mysql/*.a rm %{buildroot}%{_mandir}/man1/comp_err.1* @@ -893,7 +897,7 @@ export MTR_BUILD_THREAD=$(( $(date +%s) % 2200 )) set -ex cd %{buildroot}%{_datadir}/mysql-test - export common_testsuite_arguments=" %{?with_debug:--debug-server} --parallel=auto --force --retry=2 --suite-timeout=900 --testcase-timeout=30 --mysqld=--binlog-format=mixed --max-test-fail=5 --report-unstable-tests --clean-vardir --mysqld=--skip-innodb-use-native-aio " + export common_testsuite_arguments=" %{?with_debug:--debug-server} --parallel=auto --force --retry=2 --suite-timeout=900 --testcase-timeout=30 --skip-combinations --max-test-fail=5 --report-unstable-tests --clean-vardir --mysqld=--skip-innodb-use-native-aio " # If full testsuite has already been run on this version and we don't explicitly want the full testsuite to be run if [[ "%{last_tested_version}" == "%{version}" ]] && [[ %{force_run_testsuite} -eq 0 ]] @@ -1206,6 +1210,26 @@ fi %endif %changelog +* Wed Jan 03 2024 Lars Tangvald - 8.0.36-1 +- Update to MySQL 8.0.36 + +* Tue Dec 19 2023 Florian Weimer - 8.0.35-2 +- Fix int-conversion type error in memcached + +* Thu Sep 21 2023 Lars Tangvald - 8.0.35-1 +- Update to MySQL 8.0.35 +- Remove patches now upstream + +* Wed Aug 09 2023 Lars Tangvald - 8.0.34-1 +- Update to MySQL 8.0.34 +- Add patch from upstream bug#110569 +- Add patch to fix binlog format issue +- Use --skip-combinations over --binlog-format=mixed +- Add alignment patch upstream bug#110752 + +* Wed Apr 12 2023 Lars Tangvald - 8.0.33-1 +- Update to MySQL 8.0.33 + * Thu Jan 05 2023 Lars Tangvald - 8.0.32-1 - Update to MySQL 8.0.32