diff --git a/1001-fix-derived-condition-pushdown-test.patch b/1001-fix-derived-condition-pushdown-test.patch new file mode 100644 index 0000000000000000000000000000000000000000..69ecef1b203ac4e7def10bf0ce9b4f0f77b1e319 --- /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'; + --replace_regex $elide_costs + --skip_if_hypergraph # Depends on the query plan. + eval EXECUTE stmt USING @a, @b; +--- 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'; + EXECUTE stmt USING @a, @b; + EXPLAIN + -> Table scan on dt (rows=2) 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 0000000000000000000000000000000000000000..eecf4f413f491413e67e98773ca86e894730902b --- /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 0000000000000000000000000000000000000000..308aa99353dcb6acb5f85e0dc988effcf3070003 --- /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/download b/download index 72c9d4546b07ddfe94da18a3b4a67fc734876d64..63edb0c3d1a5776cb93839816cb44489a2f32bfa 100644 --- a/download +++ b/download @@ -1 +1 @@ -313d625fcaa932bd87b48f0cf9b40f1c mysql-boost-8.0.30.tar.gz +ac9445f619135336c8b4553d4e81b684 mysql-boost-8.0.32.tar.gz diff --git a/mysql.spec b/mysql.spec index 86abeaf0d2e63aec56ef03b4a51717f958dcdeaf..736ea3ee43664f5e4b0d6e4363804ad20ef905e3 100644 --- a/mysql.spec +++ b/mysql.spec @@ -17,7 +17,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.30 +%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 @@ -145,7 +145,7 @@ %endif Name: %{?scl_prefix}mysql -Version: 8.0.30 +Version: 8.0.32 Release: 1%{anolis_release}%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com @@ -209,6 +209,9 @@ Patch113: boost-1.76.0-fix_multiprecision_issue_419-ppc64le.patch 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++ @@ -521,6 +524,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 . _) @@ -741,6 +750,7 @@ 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* @@ -1210,10 +1220,19 @@ fi %endif %changelog -* Thu Oct 27 2022 zhangbinchen - 8.0.30-1.0.1 -- remove check_testsuite +* Thu May 18 2023 zhangbinchen - 8.0.32-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) + +* Thu Jan 05 2023 Lars Tangvald - 8.0.32-1 +- Update to MySQL 8.0.32 + +* Fri Sep 30 2022 Lars Tangvald - 8.0.31-1 +- Update to MySQL 8.0.31 * Wed Jul 06 2022 Lars Tangvald - 8.0.30-1 - Update to MySQL 8.0.30