Update to MySQL 8.0.28
This commit is contained in:
parent
61a0703bf6
commit
ed43d23321
@ -1,10 +1,10 @@
|
||||
diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql
|
||||
index 7a56616a..5e5f7950 100644
|
||||
index eff14a67..413dfc27 100644
|
||||
--- a/mysql-test/include/mtr_warnings.sql
|
||||
+++ b/mysql-test/include/mtr_warnings.sql
|
||||
@@ -359,6 +359,11 @@ INSERT INTO global_suppressions VALUES
|
||||
("A deprecated TLS version TLSv1 is enabled for channel"),
|
||||
("A deprecated TLS version TLSv1.1 is enabled for channel"),
|
||||
@@ -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."),
|
||||
|
||||
+ /*
|
||||
+ ARM32 don't support timers and get this warning in every test.
|
||||
|
@ -2,21 +2,21 @@ Support s390/s390x in performance schema's cycle-counting functions.
|
||||
Filed upstream at http://bugs.mysql.com/bug.php?id=59953
|
||||
|
||||
diff --git a/include/my_rdtsc.h b/include/my_rdtsc.h
|
||||
index b411eda0..03fc9a58 100644
|
||||
index 6e378e94..7703cf85 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
|
||||
@@ -137,5 +137,6 @@ void my_timer_init(MY_TIMER_INFO *mti);
|
||||
/* #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
|
||||
#define MY_TIMER_ROUTINE_GET_THREAD_TIMES 29
|
||||
+#define MY_TIMER_ROUTINE_ASM_S390 30
|
||||
|
||||
#endif
|
||||
diff --git a/mysys/my_rdtsc.cc b/mysys/my_rdtsc.cc
|
||||
index d9756487..817aa9d6 100644
|
||||
index 3869db57..655a955e 100644
|
||||
--- a/mysys/my_rdtsc.cc
|
||||
+++ b/mysys/my_rdtsc.cc
|
||||
@@ -168,6 +168,13 @@ ulonglong my_timer_cycles(void) {
|
||||
@@ -169,6 +169,13 @@ ulonglong my_timer_cycles(void) {
|
||||
__asm __volatile__("mrs %[rt],cntvct_el0" : [ rt ] "=r"(result));
|
||||
return result;
|
||||
}
|
||||
@ -30,7 +30,7 @@ index d9756487..817aa9d6 100644
|
||||
#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) {
|
||||
@@ -491,6 +498,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;
|
||||
|
@ -75,8 +75,8 @@
|
||||
%global sameevr %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
|
||||
Name: community-mysql
|
||||
Version: 8.0.27
|
||||
Release: 3%{?with_debug:.debug}%{?dist}
|
||||
Version: 8.0.28
|
||||
Release: 1%{?with_debug:.debug}%{?dist}
|
||||
Summary: MySQL client programs and shared libraries
|
||||
URL: http://www.mysql.com
|
||||
|
||||
@ -979,6 +979,9 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Jan 19 2022 Lars Tangvald <lars.tangvald@oracle.com> - 8.0.28-1
|
||||
- Update to MySQL 8.0.28
|
||||
|
||||
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.27-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (mysql-boost-8.0.27.tar.gz) = 6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891
|
||||
SHA512 (mysql-boost-8.0.28.tar.gz) = 4473678619a03a6c1349ce7330127f03d2da70b5b598375015abe871a0591171fc206f6e248b20085b46a0f465c52408bcadcb732ff72a737c012364d1e46297
|
||||
|
Loading…
Reference in New Issue
Block a user