Compare commits

..

No commits in common. "21b1da38094380048438935b185d5542c726ab48" and "f7e9ca1205ca242acaf727dd6d63feacaa6b9136" have entirely different histories.

8 changed files with 67 additions and 57 deletions

1
.gitattributes vendored
View File

@ -1 +0,0 @@
*.tar.gz filter=lfs diff=lfs merge=lfs -text

View File

@ -1,2 +0,0 @@
[lfs]
url = https://artlfs.openeuler.openatom.cn/src-openEuler/mysql

View File

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEvKQ0F8O0hd0SjsbUt7O3iKjTeFwFAmYJokEACgkQt7O3iKjT
eFzuPA/8DIiNVe5c8dxp+rjGMrJ2DpoATskQ4l0amQ4uI9sN/OzImnJSe6PktPAw
Ct6emNlU733l7n71k+1LmS3eAY3b7c+6pa2+IPKKzGU0kBKYbJBc7SBzs8rNsh3Q
EelZ6Khy9ZNLZIVke8qp80m2Vn2T25fS8VpqV8U5Oo+WrVaek1/xtUeDyxgJL0yu
E/1xTztulVePN81z8sq1tLhHddfRt06yTzcOj/Iuq0tBao4AAMqHqYN4H69ztNBo
RUUjrFp95FM6GWvFzA8QoPxHat4JpC0Trnb9kXayNORiLb5y+Achsw9/Q30tCnQR
l2tteJkAJ2ZXrdCiFIB2U7SB+8IVO3JFYYLC+HNxdgf+fqPc97V+AsRSIXL2GslR
SnZ24Tn0w75ZmQvRsLlF2s+YIdA+sgsLG8rccXiQKT49C0zqbA2ah9sm7jKuqBIy
Hv5sqjzvho3h1O2wSCPrOXyLaXmg7smnjw0dYUZuX2VxhoOWeg6Y8OWka1a8RX9i
Xa10WAcccFmgYzK+MqblXnzJIrSbZBNCZ6tMPjc8ouTT5w0e9z4iaqJbGx45poLP
JHZnWh5KKxMVEZ+Suiuzhw0IWXUBjKLJwArenWBEk9oxeTHC6CiQBqfLqsSQd9sL
6efpNmoqrQj8TG/64UWlo86K7hxZdYfTp0dbfe/9IrpEks1PWCs=
=pODp
-----END PGP SIGNATURE-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c2aa67c618edfa1bc379107fe819ca8e94cba5d85f156d1053b8fedc88cc5f8f
size 492301593

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEvKQ0F8O0hd0SjsbUt7O3iKjTeFwFAmfsxhAACgkQt7O3iKjT
eFyExw//etTPv3bxpiwiNxAihTVQ8j+rc9KCzmbhm251DOTGjbwjDitEqve35nJK
pxaWaTHQnn5kbqPz8px/BzYd0JldluPYMGSqMDsLylxGf3R5e+x+rtKQtiuBuKoe
QVBrfFjJXEwkv9LuZvZoZDMf7pgdumcBencKl7mBrQzIRGxR2aFqfJCoy6Q0iHBU
Cr5Wr+w3uidlOWAEAEDFRRTZyB07IqRvoRIjabEBTToXmux/QzMG+diVpzYlwV2s
sXD4begczJSK2G+3oFvpNt4ybuukQJqGIu85KU1P55OxzcK6kZCk/++sTTGxyjEH
GMAO+k8CiZyDMRIMXbnoKylCdwjqkXbg7vHo4JAaeqnOig6Gxkot/WoEPHWGi/Dm
u74LDCLOv3QXz/wI0YdaVVYb5JFlsDtKN0fmEj7G+1dfkvGkBr7yvMP/KQmv4sbv
QVnQiOyvvqKUWUFtfYbkSac0NSxiD6X81WOT1hEY9DhVqeqtQY9ZIwrB+7MNZefM
pkmorsDHJfGOsfna/bXIfHIbmLCoGPUVUReT/aNYglOs7RzoCstI+2dgPvRTPeOB
28rx/gOm9d9TEWvMIw0Usj0a7ShqsiMw8GN41Ybcec11P8HnyjlHcOE8MxKBY4lR
mPoGFadUEDERkwuoVAFxgYB5dElfQm+GvaTCa5tuEApDv68J+bA=
=x3/7
-----END PGP SIGNATURE-----

48
mysql-s390-tsc.patch Normal file
View File

@ -0,0 +1,48 @@
Support s390/s390x in performance schema's cycle-counting functions.
Filed upstream at http://bugs.mysql.com/bug.php?id=59953
---
include/my_rdtsc.h | 1 +
mysys/my_rdtsc.cc | 9 +++++++++
2 files changed, 10 insertions(+)
diff --git a/include/my_rdtsc.h b/include/my_rdtsc.h
index b411eda0..03fc9a58 100644
--- a/include/my_rdtsc.h
+++ b/include/my_rdtsc.h
@@ -128,5 +128,6 @@ void my_timer_init(MY_TIMER_INFO *mti);
#define MY_TIMER_ROUTINE_GETSYSTEMTIMEASFILETIME 26
/* #define MY_TIMER_ROUTINE_ASM_SUNPRO_X86_64 27 - No longer used */
#define MY_TIMER_ROUTINE_ASM_AARCH64 28
+#define MY_TIMER_ROUTINE_ASM_S390 29
#endif
diff --git a/mysys/my_rdtsc.cc b/mysys/my_rdtsc.cc
index d9756487..817aa9d6 100644
--- a/mysys/my_rdtsc.cc
+++ b/mysys/my_rdtsc.cc
@@ -168,6 +168,13 @@ ulonglong my_timer_cycles(void) {
__asm __volatile__("mrs %[rt],cntvct_el0" : [ rt ] "=r"(result));
return result;
}
+#elif defined(__GNUC__) && defined(__s390__)
+ /* covers both s390 and s390x */
+ {
+ ulonglong result;
+ __asm__ __volatile__ ("stck %0" : "=Q" (result) : : "cc");
+ return result;
+ }
#elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME)
/* gethrtime may appear as either cycle or nanosecond counter */
return (ulonglong)gethrtime();
@@ -453,6 +460,8 @@ void my_timer_init(MY_TIMER_INFO *mti) {
mti->cycles.routine = MY_TIMER_ROUTINE_ASM_GCC_SPARC64;
#elif defined(__GNUC__) && defined(__aarch64__)
mti->cycles.routine = MY_TIMER_ROUTINE_ASM_AARCH64;
+#elif defined(__GNUC__) && defined(__s390__)
+ mti->cycles.routine = MY_TIMER_ROUTINE_ASM_S390;
#elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME)
mti->cycles.routine = MY_TIMER_ROUTINE_GETHRTIME;
#else
--
2.27.0

View File

@ -29,8 +29,8 @@
%bcond_without conflicts
%global sameevr %{?epoch:%{epoch}:}%{version}-%{release}
Name: mysql
Version: 8.0.42
Release: 1
Version: 8.0.37
Release: 2
Summary: MySQL client programs and shared libraries
URL: http://www.mysql.com
License: GPL-2.0-or-later AND LGPL-2.1-only AND BSL-1.0 AND GPL-1.0-or-later OR Artistic-1.0-Perl AND BSD-2-Clause
@ -216,7 +216,7 @@ The package provides Docs for development of MySQL applications.
%prep
# download source0 and gpg check
# wget -qO %{SOURCE0} https://user-repo.openeuler.openatom.cn/lfs-tar/mysql/mysql-boost-%{version}.tar.gz
wget -qO %{SOURCE0} https://user-repo.openeuler.openatom.cn/lfs-tar/mysql/mysql-boost-%{version}.tar.gz
gpg --import %{SOURCE33}
gpg --verify %{SOURCE32} %{SOURCE0}
%setup -q -n mysql-%{version}
@ -551,38 +551,6 @@ fi
%{_mandir}/man1/mysql_config.1*
%changelog
* Wed Apr 16 2025 yaoxin <1024769339@qq.com> - 8.0.42-1
- Update to 8.0.42 for fix CVEs(CVE-2025-21574,CVE-2025-21575,CVE-2025-21577,
CVE-2025-21580,CVE-2025-21581,CVE-2025-21584,CVE-2025-21585,CVE-2025-30681,
CVE-2025-30682,CVE-2025-30683,CVE-2025-30684,CVE-2025-30685,CVE-2025-30687,
CVE-2025-30688,CVE-2025-30689,CVE-2025-30693,CVE-2025-30695,CVE-2025-30696,
CVE-2025-30699,CVE-2025-30703,CVE-2025-30704,CVE-2025-30705,CVE-2025-30710,
CVE-2025-30715,CVE-2025-30721,CVE-2025-30722
* Wed Jan 22 2025 yaoxin <1024769339@qq.com> - 8.0.41-1
- Update to 8.0.41 for fix CVEs(CVE-2025-21490,CVE-2025-21491,CVE-2025-21495,
CVE-2025-21497,CVE-2025-21500,CVE-2025-21501,CVE-2025-21503,CVE-2025-21505,
CVE-2025-21518,CVE-2025-21519,CVE-2025-21520,CVE-2025-21522,CVE-2025-21523,
CVE-2025-21529,CVE-2025-21531,CVE-2025-21540,CVE-2025-21543,CVE-2025-21546,
CVE-2025-21555,CVE-2025-21559)
* Thu Nov 21 2024 zhouyi <zhouyi198@h-partners.com> - 8.0.40-2
- Add lfs config to branch openEuler-24.03-LTS
Edit mysql.spec
* Thu Oct 17 2024 wangkai <13474090681@163.com> - 8.0.40-1
- Update to 8.0.40 for fix CVEs(CVE-2024-21218,CVE-2024-21196,CVE-2024-21207,
CVE-2024-21198,CVE-2024-21203,CVE-2024-21213,CVE-2024-21239,CVE-2024-21199,
CVE-2024-21197,CVE-2024-21247,CVE-2024-21193,CVE-2024-21212,CVE-2024-21241,
CVE-2024-21230,CVE-2024-21236,CVE-2024-21194,CVE-2024-21238,CVE-2024-21237,
CVE-2024-21201,CVE-2024-21231,CVE-2024-21219,CVE-2024-21185)
* Mon Jul 22 2024 wangkai <13474090681@163.com> - 8.0.38-1
- Update to 8.0.38 for fix CVEs(CVE-2024-21125,CVE-2024-21142,CVE-2024-21179,
CVE-2024-21171,CVE-2024-21130,CVE-2024-21162,CVE-2024-21177,CVE-2024-20996,
CVE-2024-21134,CVE-2024-21165,CVE-2024-21173,CVE-2024-21129,CVE-2024-21127,
CVE-2024-21163)
* Thu Jun 13 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 8.0.37-2
- fix build error for loongarch64