From 6703eda4c0672cf527b5906df2dfc99813b7e9c9 Mon Sep 17 00:00:00 2001
From: Lars Tangvald <lars.tangvald@oracle.com>
Date: Tue, 12 Oct 2021 15:54:40 +0200
Subject: [PATCH] Update to MySQL 8.0.27

Related: #1969430
Resolves: #2018325
---
 mysql-s390-tsc.patch | 12 ++++++------
 mysql.spec           |  5 ++++-
 sources              |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/mysql-s390-tsc.patch b/mysql-s390-tsc.patch
index 3fca0ac..f86899c 100644
--- a/mysql-s390-tsc.patch
+++ b/mysql-s390-tsc.patch
@@ -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 65f7df19..a28f470c 100644
+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
+ /* #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 54d19691..f18c182f 100644
+index d9756487..817aa9d6 100644
 --- a/mysys/my_rdtsc.cc
 +++ b/mysys/my_rdtsc.cc
-@@ -204,6 +204,13 @@ ulonglong my_timer_cycles(void) {
+@@ -168,6 +168,13 @@ ulonglong my_timer_cycles(void) {
      __asm __volatile__("mrs %[rt],cntvct_el0" : [ rt ] "=r"(result));
      return result;
    }
@@ -30,8 +30,8 @@ index 54d19691..f18c182f 100644
  #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME)
    /* gethrtime may appear as either cycle or nanosecond counter */
    return (ulonglong)gethrtime();
-@@ -505,6 +512,8 @@ void my_timer_init(MY_TIMER_INFO *mti) {
-   mti->cycles.routine = MY_TIMER_ROUTINE_ASM_GCC_SPARC32;
+@@ -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__)
diff --git a/mysql.spec b/mysql.spec
index 9a8e24b..15be54c 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -74,7 +74,7 @@
 %global sameevr   %{?epoch:%{epoch}:}%{version}-%{release}
 
 Name:             mysql
-Version:          8.0.26
+Version:          8.0.27
 Release:          1%{?with_debug:.debug}%{?dist}
 Summary:          MySQL client programs and shared libraries
 URL:              http://www.mysql.com
@@ -973,6 +973,9 @@ fi
 %endif
 
 %changelog
+* Sun Oct 31 2021 Lars Tangvald <lars.tangvald@oracle.com> - 8.0.27-1
+- Update to MySQL 8.0.27
+
 * Tue Sep 21 2021 Lars Tangvald <lars.tangvald@oracle.com> - 8.0.26-1
 - Update to MySQL 8.0.26
 
diff --git a/sources b/sources
index 598a7e7..d80ec8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mysql-boost-8.0.26.tar.gz) = 63d47cb52407a816dc9f4330b99924624dfee46e57e7fdce19eff32909dd9e23251e2439d1807b002a1661b547173222c77465a3ca4dbb312414a84927809cfc
+SHA512 (mysql-boost-8.0.27.tar.gz) = 6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891