diff --git a/add-loongarch64-support-for-mysql.patch b/add-loongarch64-support-for-mysql.patch index fb6215c54458ad1fd6f6e52ab712fb0204e9fcc5..f23b884bcf3f02d73258e70b96dabe73f435b0ae 100644 --- a/add-loongarch64-support-for-mysql.patch +++ b/add-loongarch64-support-for-mysql.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add loongarch64 support for mysql --- boost/boost_1_77_0/boost/predef/other/endian.h | 1 + - .../icu/icu-release-69-1/source/i18n/double-conversion-utils.h | 3 ++- + .../icu/icu-release-73-1/source/i18n/double-conversion-utils.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/boost/boost_1_77_0/boost/predef/other/endian.h b/boost/boost_1_77_0/boost/predef/other/endian.h @@ -20,13 +20,13 @@ index d8ec63ff..255a2587 100644 defined(__e2k__) # undef BOOST_ENDIAN_LITTLE_BYTE # define BOOST_ENDIAN_LITTLE_BYTE BOOST_VERSION_NUMBER_AVAILABLE -diff --git a/extra/icu/icu-release-69-1/source/i18n/double-conversion-utils.h b/extra/icu/icu-release-69-1/source/i18n/double-conversion-utils.h +diff --git a/extra/icu/icu-release-73-1/source/i18n/double-conversion-utils.h b/extra/icu/icu-release-73-1/source/i18n/double-conversion-utils.h index c9374636..44e55d58 100644 ---- a/extra/icu/icu-release-69-1/source/i18n/double-conversion-utils.h -+++ b/extra/icu/icu-release-69-1/source/i18n/double-conversion-utils.h -@@ -128,7 +128,8 @@ int main(int argc, char** argv) { +--- a/extra/icu/icu-release-73-1/source/i18n/double-conversion-utils.h ++++ b/extra/icu/icu-release-73-1/source/i18n/double-conversion-utils.h +@@ -160,7 +160,8 @@ int main(int argc, char** argv) { defined(__riscv) || defined(__e2k__) || \ - defined(__or1k__) || defined(__arc__) || \ + defined(__or1k__) || defined(__arc__) || defined(__ARC64__) || \ defined(__microblaze__) || defined(__XTENSA__) || \ - defined(__EMSCRIPTEN__) || defined(__wasm32__) + defined(__EMSCRIPTEN__) || defined(__wasm32__) || \ diff --git a/download b/download index e13a9a9a11645cb5fc092eb203031b7ee2b10d79..7cb5494dd163d59b479a8bbb7ece5f5b1252ea7e 100644 --- a/download +++ b/download @@ -1 +1 @@ -20ffc71fb8acd705cdc4a8ae4cdedf23 mysql-boost-8.0.33.tar.gz +e0cb61cbf6e1144c452368c4535ae931 mysql-boost-8.0.37.tar.gz diff --git a/mysql-mtr.patch b/mysql-mtr.patch index 6f193b9a68093b01c464fafc0ecc0ab078da5115..2b47b20f49cbf5b8f603e468447de6352a4a07bc 100644 --- a/mysql-mtr.patch +++ b/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 +@@ -3551,17 +3551,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/mysql.spec b/mysql.spec index 0a47e0ad6f843806c00680db9da06e43e04829f7..d7822af6a1f61df63f9b484b8f7ffce677f25c90 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,4 +1,4 @@ -%define anolis_release 3 +%define anolis_release 1 # Name of the package without any prefixes %global pkg_name %{name} %global pkgnamepatch mysql @@ -14,7 +14,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.33 +%global last_tested_version 8.0.37 # 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 @@ -75,7 +75,7 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: mysql -Version: 8.0.33 +Version: 8.0.37 Release: %{anolis_release}%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com @@ -84,7 +84,7 @@ URL: http://www.mysql.com # not only GPL code. See README.mysql-license License: GPLv2 with exceptions and LGPLv2 and BSD -Source0: https://downloads.mysql.com/archives/get/p/23/file/%{name}-boost-%{version}.tar.gz +Source0: https://dev.mysql.com/get/Downloads/MySQL-8.0/%{name}-boost-%{version}.tar.gz Source2: mysql_config_multilib.sh Source3: my.cnf.in Source6: README.mysql-docs @@ -376,7 +376,7 @@ pushd boost/boost_$(echo %{boost_bundled_version}| tr . _) %patch111 -p1 %patch112 -p1 popd -%patch113 -p1 +#%%patch113 -p1 %patch114 -p1 # generate a list of tests that fail, but are not disabled by upstream @@ -931,6 +931,9 @@ fi %endif %changelog +* Wed May 15 2024 mgb01105731 - 8.0.37-1 +- update to 8.0.37 + * Fri Jan 12 2024 Wenlong Zhang - 8.0.33-3 - mysql 8.0.33 binary crashes on startup on loongarch64 diff --git a/revert-be8348a7.patch b/revert-be8348a7.patch index b394e3af03dadb6240d285827807fb675d38c463..af89868e7127d57f32b95a858bb045ddd78f0554 100644 --- a/revert-be8348a7.patch +++ b/revert-be8348a7.patch @@ -59,7 +59,7 @@ index 1673b744..00000000 --- a/include/my_aligned_malloc.h +++ /dev/null @@ -1,55 +0,0 @@ --/* Copyright (c) 2022, 2023, Oracle and/or its affiliates. +-/* Copyright (c) 2022, 2024, Oracle and/or its affiliates. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License, version 2.0, @@ -118,7 +118,7 @@ diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index 7b2f108c..e83d1642 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt -@@ -55,7 +55,6 @@ SET(MYSYS_SOURCES +@@ -56,7 +56,6 @@ SET(MYSYS_SOURCES mf_wcomp.cc mulalloc.cc my_access.cc @@ -132,7 +132,7 @@ index 8de56246..00000000 --- a/mysys/my_aligned_malloc.cc +++ /dev/null @@ -1,79 +0,0 @@ --/* Copyright (c) 2022, 2023, Oracle and/or its affiliates. +-/* Copyright (c) 2022, 2024, Oracle and/or its affiliates. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License, version 2.0, @@ -215,7 +215,7 @@ diff --git a/sql/memory/aligned_atomic.h b/sql/memory/aligned_atomic.h index 423366da..985efb75 100644 --- a/sql/memory/aligned_atomic.h +++ b/sql/memory/aligned_atomic.h -@@ -38,9 +38,8 @@ +@@ -39,9 +39,8 @@ #include #endif @@ -226,7 +226,7 @@ index 423366da..985efb75 100644 /** Calculates and returns the size of the CPU cache line. -@@ -259,28 +258,14 @@ class Aligned_atomic { +@@ -261,28 +260,14 @@ class Aligned_atomic { @return The pointer to the underlying `std::atomic` object. */ @@ -257,7 +257,7 @@ index 423366da..985efb75 100644 /* The size of `std::atomic`, as returned by `sizeof std::atomic`. -@@ -298,7 +283,7 @@ class Aligned_atomic { +@@ -300,7 +285,7 @@ class Aligned_atomic { /** The size of the byte buffer. */ size_t m_storage_size{0}; /** The byte buffer to use as underlying storage. */ @@ -266,7 +266,7 @@ index 423366da..985efb75 100644 /** The pointer to the underlying `std::atomic` object. */ std::atomic *m_underlying{nullptr}; }; -@@ -306,10 +291,9 @@ class Aligned_atomic { +@@ -308,10 +293,9 @@ class Aligned_atomic { template memory::Aligned_atomic::Aligned_atomic() @@ -280,7 +280,7 @@ index 423366da..985efb75 100644 template memory::Aligned_atomic::Aligned_atomic(T value) -@@ -318,16 +302,12 @@ memory::Aligned_atomic::Aligned_atomic(T value) +@@ -320,16 +304,12 @@ memory::Aligned_atomic::Aligned_atomic(T value) } template @@ -301,7 +301,7 @@ index 423366da..985efb75 100644 rhs.m_underlying = nullptr; } -@@ -335,25 +315,22 @@ template +@@ -337,25 +317,22 @@ template memory::Aligned_atomic::~Aligned_atomic() { if (this->m_underlying != nullptr) { this->m_underlying->~atomic(); @@ -332,7 +332,7 @@ index 423366da..985efb75 100644 rhs.m_underlying = nullptr; return (*this); } -@@ -393,25 +370,13 @@ bool memory::Aligned_atomic::operator!=(T rhs) const { +@@ -395,25 +372,13 @@ bool memory::Aligned_atomic::operator!=(T rhs) const { } template @@ -364,7 +364,7 @@ diff --git a/unittest/gunit/memory/aligned_atomic-t.cc b/unittest/gunit/memory/a index 39ac0724..63fdc3aa 100644 --- a/unittest/gunit/memory/aligned_atomic-t.cc +++ b/unittest/gunit/memory/aligned_atomic-t.cc -@@ -25,9 +25,7 @@ +@@ -26,9 +26,7 @@ #include #include @@ -374,7 +374,7 @@ index 39ac0724..63fdc3aa 100644 #include #include -@@ -59,37 +57,5 @@ TEST_F(Aligned_atomic_test, Class_template_test) { +@@ -60,37 +58,5 @@ TEST_F(Aligned_atomic_test, Class_template_test) { EXPECT_EQ(atm3->load(), 2); }