|
|
|
|
@ -1,6 +1,3 @@
|
|
|
|
|
# To both save infrastrucutre resources and workaround testsuite clashes
|
|
|
|
|
ExcludeArch: %{ix86}
|
|
|
|
|
|
|
|
|
|
# Name of the package without any prefixes
|
|
|
|
|
%global pkg_name %{name}
|
|
|
|
|
%global pkgnamepatch mysql
|
|
|
|
|
@ -16,7 +13,7 @@ ExcludeArch: %{ix86}
|
|
|
|
|
# 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.32
|
|
|
|
|
# Set to 1 to force run the testsuite even if it was already tested in current version
|
|
|
|
|
%global force_run_testsuite 0
|
|
|
|
|
# Aditional SELinux rules
|
|
|
|
|
@ -77,8 +74,8 @@ ExcludeArch: %{ix86}
|
|
|
|
|
%global sameevr %{?epoch:%{epoch}:}%{version}-%{release}
|
|
|
|
|
|
|
|
|
|
Name: mysql
|
|
|
|
|
Version: 8.0.41
|
|
|
|
|
Release: 2%{?with_debug:.debug}%{?dist}
|
|
|
|
|
Version: 8.0.32
|
|
|
|
|
Release: 1%{?with_debug:.debug}%{?dist}.inferit
|
|
|
|
|
Summary: MySQL client programs and shared libraries
|
|
|
|
|
URL: http://www.mysql.com
|
|
|
|
|
|
|
|
|
|
@ -120,8 +117,6 @@ Patch51: %{pkgnamepatch}-sharedir.patch
|
|
|
|
|
Patch52: %{pkgnamepatch}-rpath.patch
|
|
|
|
|
Patch53: %{pkgnamepatch}-mtr.patch
|
|
|
|
|
Patch54: %{pkgnamepatch}-arm32-timer.patch
|
|
|
|
|
Patch55: %{pkgnamepatch}-c99.patch
|
|
|
|
|
Patch56: %{pkgnamepatch}-flush-logrotate.patch
|
|
|
|
|
|
|
|
|
|
# Patches taken from boost 1.59
|
|
|
|
|
Patch111: boost-1.58.0-pool.patch
|
|
|
|
|
@ -386,22 +381,20 @@ the MySQL sources.
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
|
%setup -q -n mysql-%{version}
|
|
|
|
|
%patch -P1 -p1
|
|
|
|
|
%patch -P3 -p1
|
|
|
|
|
%patch -P4 -p1
|
|
|
|
|
%patch -P5 -p1
|
|
|
|
|
%patch -P51 -p1
|
|
|
|
|
%patch -P52 -p1
|
|
|
|
|
%patch -P53 -p1
|
|
|
|
|
%patch -P54 -p1
|
|
|
|
|
%patch -P55 -p1
|
|
|
|
|
%patch -P56 -p1
|
|
|
|
|
%patch1 -p1
|
|
|
|
|
%patch3 -p1
|
|
|
|
|
%patch4 -p1
|
|
|
|
|
%patch5 -p1
|
|
|
|
|
%patch51 -p1
|
|
|
|
|
%patch52 -p1
|
|
|
|
|
%patch53 -p1
|
|
|
|
|
%patch54 -p1
|
|
|
|
|
|
|
|
|
|
# Patch Boost
|
|
|
|
|
pushd boost/boost_$(echo %{boost_bundled_version}| tr . _)
|
|
|
|
|
%patch -P111 -p1
|
|
|
|
|
%patch -P112 -p1
|
|
|
|
|
%patch -P113 -p1
|
|
|
|
|
%patch111 -p0
|
|
|
|
|
%patch112 -p1
|
|
|
|
|
%patch113 -p2
|
|
|
|
|
popd
|
|
|
|
|
|
|
|
|
|
# generate a list of tests that fail, but are not disabled by upstream
|
|
|
|
|
@ -443,6 +436,7 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
|
|
|
|
|
# so we can't use %%{_datadir} and so forth here.
|
|
|
|
|
%cmake \
|
|
|
|
|
-DBUILD_CONFIG=mysql_release \
|
|
|
|
|
-DFEATURE_SET="community" \
|
|
|
|
|
-DINSTALL_LAYOUT=RPM \
|
|
|
|
|
-DDAEMON_NAME="%{daemon_name}" \
|
|
|
|
|
-DDAEMON_NO_PREFIX="%{daemon_no_prefix}" \
|
|
|
|
|
@ -490,6 +484,7 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
|
|
|
|
|
%{?with_debug: -DWITH_DEBUG=1} \
|
|
|
|
|
%{?with_debug: -DMYSQL_MAINTAINER_MODE=0} \
|
|
|
|
|
-DTMPDIR=/var/tmp \
|
|
|
|
|
-DWITH_MYSQLD_LDFLAGS="%{build_ldflags}" \
|
|
|
|
|
-DCMAKE_C_LINK_FLAGS="%{build_ldflags}" \
|
|
|
|
|
-DCMAKE_CXX_LINK_FLAGS="%{build_ldflags}" \
|
|
|
|
|
-DCMAKE_SKIP_INSTALL_RPATH=YES \
|
|
|
|
|
@ -542,6 +537,7 @@ install -p -m 755 %{_vpath_builddir}/scripts/mysql-check-socket %{buildroot}%{_l
|
|
|
|
|
install -p -m 644 %{_vpath_builddir}/scripts/mysql-scripts-common %{buildroot}%{_libexecdir}/mysql-scripts-common
|
|
|
|
|
install -D -p -m 0644 %{_vpath_builddir}/scripts/server.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/%{pkg_name}-server.cnf
|
|
|
|
|
|
|
|
|
|
rm %{buildroot}%{_infodir}/mysql.info*
|
|
|
|
|
rm %{buildroot}%{_libdir}/mysql/*.a
|
|
|
|
|
rm %{buildroot}%{_mandir}/man1/comp_err.1*
|
|
|
|
|
|
|
|
|
|
@ -638,14 +634,14 @@ 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 --skip-combinations --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 --mysqld=--binlog-format=mixed --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 ]]
|
|
|
|
|
then
|
|
|
|
|
# in further rebuilds only run the basic "main" suite (~800 tests)
|
|
|
|
|
echo "running only base testsuite"
|
|
|
|
|
perl ./mysql-test-run.pl $common_testsuite_arguments --suite=main --mem --skip-test-list=%{skiplist}
|
|
|
|
|
perl ./mysql-test-run.pl $common_testsuite_arguments --suite=main --skip-test-list=%{skiplist}
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# If either this version wasn't marked as tested yet or I explicitly want to run the testsuite, run everything we have (~4000 test)
|
|
|
|
|
@ -915,11 +911,9 @@ fi
|
|
|
|
|
%{_libdir}/mysql/plugin/component_test_mysql_current_thread_reader.so
|
|
|
|
|
%{_libdir}/mysql/plugin/component_test_mysql_runtime_error.so
|
|
|
|
|
%{_libdir}/mysql/plugin/component_test_mysql_system_variable_set.so
|
|
|
|
|
%{_libdir}/mysql/plugin/component_test_mysql_thd_store_service.so
|
|
|
|
|
%{_libdir}/mysql/plugin/component_test_pfs_notification.so
|
|
|
|
|
%{_libdir}/mysql/plugin/component_test_pfs_resource_group.so
|
|
|
|
|
%{_libdir}/mysql/plugin/component_test_sensitive_system_variables.so
|
|
|
|
|
%{_libdir}/mysql/plugin/component_test_server_telemetry_traces.so
|
|
|
|
|
%{_libdir}/mysql/plugin/component_test_status_var_reader.so
|
|
|
|
|
%{_libdir}/mysql/plugin/component_test_status_var_service_int.so
|
|
|
|
|
%{_libdir}/mysql/plugin/component_test_status_var_service_reg_only.so
|
|
|
|
|
@ -986,44 +980,8 @@ fi
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Thu Feb 13 2025 Lukas Javorsky <ljavorsk@redhat.com> - 8.0.41-2
|
|
|
|
|
- Fix patching of logrotate
|
|
|
|
|
|
|
|
|
|
* Fri Feb 07 2025 Lukas Javorsky <ljavorsk@redhat.com> - 8.0.41-1
|
|
|
|
|
- Update to MySQL 8.0.41
|
|
|
|
|
|
|
|
|
|
* Thu Feb 06 2025 Lukas Javorsky <ljavorsk@redhat.com> - 8.0.40-1
|
|
|
|
|
- Update to MySQL 8.0.40
|
|
|
|
|
|
|
|
|
|
* Thu Feb 06 2025 Lukas Javorsky <ljavorsk@redhat.com> - 8.0.39-1
|
|
|
|
|
- Rebase to version 8.0.39
|
|
|
|
|
|
|
|
|
|
* Fri Apr 19 2024 Honza Horak <hhorak@redhat.com> - 8.0.37-2
|
|
|
|
|
- Use signal to flush logs when rotating
|
|
|
|
|
|
|
|
|
|
* Thu Apr 18 2024 Lars Tangvald <lars.tangvald@oracle.com> - 8.0.37-1
|
|
|
|
|
- Update to MySQL 8.0.37
|
|
|
|
|
- Remove some legacy cmake options
|
|
|
|
|
|
|
|
|
|
* Wed Jan 03 2024 Lars Tangvald <lars.tangvald@oracle.com> - 8.0.36-1
|
|
|
|
|
- Update to MySQL 8.0.36
|
|
|
|
|
|
|
|
|
|
* Tue Dec 19 2023 Florian Weimer <fweimer@redhat.com> - 8.0.35-2
|
|
|
|
|
- Fix int-conversion type error in memcached
|
|
|
|
|
|
|
|
|
|
* Thu Sep 21 2023 Lars Tangvald <lars.tangvald@oracle.com> - 8.0.35-1
|
|
|
|
|
- Update to MySQL 8.0.35
|
|
|
|
|
- Remove patches now upstream
|
|
|
|
|
|
|
|
|
|
* Wed Aug 09 2023 Lars Tangvald <lars.tangvald@oracle.com> - 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 <lars.tangvald@oracle.com> - 8.0.33-1
|
|
|
|
|
- Update to MySQL 8.0.33
|
|
|
|
|
* Thu Jul 13 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 8.0.32-1
|
|
|
|
|
- Disable --mem option in tests
|
|
|
|
|
|
|
|
|
|
* Thu Jan 05 2023 Lars Tangvald <lars.tangvald@oracle.com> - 8.0.32-1
|
|
|
|
|
- Update to MySQL 8.0.32
|
|
|
|
|
|
