rpms/mysql
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to MySQL 8.0.28

Browse Source 
Related: #2048378 #2048164
This commit is contained in:
Lars Tangvald 2022-01-06 15:47:39 +01:00 committed by Michal Schorm
parent 1edb9a3308
commit 4e5e30e246
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-arm32-timer.patch
View File

@ -1,10 +1,10 @@
diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql 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 --- a/mysql-test/include/mtr_warnings.sql
+++ b/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql
@@ -359,6 +359,11 @@ INSERT INTO global_suppressions VALUES @@ -363,6 +363,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"), ("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. + ARM32 don't support timers and get this warning in every test.

14
mysql-s390-tsc.patch
View File

@ -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 Filed upstream at http://bugs.mysql.com/bug.php?id=59953
diff --git a/include/my_rdtsc.h b/include/my_rdtsc.h 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 --- a/include/my_rdtsc.h
+++ b/include/my_rdtsc.h +++ b/include/my_rdtsc.h
@@ -128,5 +128,6 @@ void my_timer_init(MY_TIMER_INFO *mti); @@ -137,5 +137,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_SUNPRO_X86_64 27 - No longer used */
#define MY_TIMER_ROUTINE_ASM_AARCH64 28 #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 #endif
diff --git a/mysys/my_rdtsc.cc b/mysys/my_rdtsc.cc 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 --- a/mysys/my_rdtsc.cc
+++ b/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)); __asm __volatile__("mrs %[rt],cntvct_el0" : [ rt ] "=r"(result));
return result; return result;
} }
@ -30,7 +30,7 @@ index d9756487..817aa9d6 100644
#elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME) #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME)
/* gethrtime may appear as either cycle or nanosecond counter */ /* gethrtime may appear as either cycle or nanosecond counter */
return (ulonglong)gethrtime(); 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; mti->cycles.routine = MY_TIMER_ROUTINE_ASM_GCC_SPARC64;
#elif defined(__GNUC__) && defined(__aarch64__) #elif defined(__GNUC__) && defined(__aarch64__)
mti->cycles.routine = MY_TIMER_ROUTINE_ASM_AARCH64; mti->cycles.routine = MY_TIMER_ROUTINE_ASM_AARCH64;

5
mysql.spec
View File

@ -74,7 +74,7 @@
%global sameevr %{?epoch:%{epoch}:}%{version}-%{release} %global sameevr %{?epoch:%{epoch}:}%{version}-%{release}
Name: mysql Name: mysql
Version: 8.0.27 Version: 8.0.28
Release: 1%{?with_debug:.debug}%{?dist} Release: 1%{?with_debug:.debug}%{?dist}
Summary: MySQL client programs and shared libraries Summary: MySQL client programs and shared libraries
URL: http://www.mysql.com URL: http://www.mysql.com
@ -973,6 +973,9 @@ fi
%endif %endif
%changelog %changelog
* Wed Jan 05 2022 Lars Tangvald <lars.tangvald@oracle.com> - 8.0.28-1
- Update to MySQL 8.0.28
* Sun Oct 31 2021 Lars Tangvald <lars.tangvald@oracle.com> - 8.0.27-1 * Sun Oct 31 2021 Lars Tangvald <lars.tangvald@oracle.com> - 8.0.27-1
- Update to MySQL 8.0.27 - Update to MySQL 8.0.27

2
sources
View File

@ -1 +1 @@
SHA512 (mysql-boost-8.0.27.tar.gz) = 6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891 SHA512 (mysql-boost-8.0.28.tar.gz) = 4473678619a03a6c1349ce7330127f03d2da70b5b598375015abe871a0591171fc206f6e248b20085b46a0f465c52408bcadcb732ff72a737c012364d1e46297