From 1f075b8d1e208c99ca678fd874ec36b5d160bea1 Mon Sep 17 00:00:00 2001
From: AlmaLinux RelEng Bot <eabdullin@almalinux.org>
Date: Tue, 24 Mar 2026 08:37:02 -0400
Subject: [PATCH] import CS git mysql-8.0.45-1.el8

---
 .gitignore                                    |  2 +-
 .mysql.metadata                               |  2 +-
 ...d2a53834266c7256830c8d34672ea55fe17b.patch | 19 +++++++++++++++++++
 SPECS/mysql.spec                              | 13 +++++++++++--
 4 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 SOURCES/upstream_735bd2a53834266c7256830c8d34672ea55fe17b.patch

diff --git a/.gitignore b/.gitignore
index bd181de..38920e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/mysql-boost-8.0.44.tar.gz
+SOURCES/mysql-boost-8.0.45.tar.gz
diff --git a/.mysql.metadata b/.mysql.metadata
index 7df1052..640fe57 100644
--- a/.mysql.metadata
+++ b/.mysql.metadata
@@ -1 +1 @@
-abe951070556eeb22c0f5186d98254eef52c365d SOURCES/mysql-boost-8.0.44.tar.gz
+7717b8f6814072160cac2cb3b836045c5ef2ca7f SOURCES/mysql-boost-8.0.45.tar.gz
diff --git a/SOURCES/upstream_735bd2a53834266c7256830c8d34672ea55fe17b.patch b/SOURCES/upstream_735bd2a53834266c7256830c8d34672ea55fe17b.patch
new file mode 100644
index 0000000..61af855
--- /dev/null
+++ b/SOURCES/upstream_735bd2a53834266c7256830c8d34672ea55fe17b.patch
@@ -0,0 +1,19 @@
+diff -Naur mysql-8.0.44/cmake/build_configurations/compiler_options.cmake mysql-8.0.44_patched/cmake/build_configurations/compiler_options.cmake
+--- mysql-8.0.44/cmake/build_configurations/compiler_options.cmake	2025-09-24 13:00:44.000000000 +0200
++++ mysql-8.0.44_patched/cmake/build_configurations/compiler_options.cmake	2026-02-12 17:19:26.417757345 +0100
+@@ -65,15 +65,6 @@
+     SET(COMMON_CXX_FLAGS             "-std=c++17 -fno-omit-frame-pointer")
+   ENDIF()
+ 
+-  # Faster TLS model
+-  # libprotobuf-lite.so.24.4: cannot allocate memory in static TLS block
+-  IF(MY_COMPILER_IS_GNU_OR_CLANG
+-      AND NOT LINUX_ARM
+-      AND NOT SOLARIS AND NOT LINUX_RHEL6 AND NOT LINUX_ALPINE)
+-    STRING_APPEND(COMMON_C_FLAGS     " -ftls-model=initial-exec")
+-    STRING_APPEND(COMMON_CXX_FLAGS   " -ftls-model=initial-exec")
+-  ENDIF()
+-
+   # Use STRING_PREPEND here, so command-line input can override our defaults.
+   STRING_PREPEND(CMAKE_C_FLAGS                  "${COMMON_C_FLAGS} ")
+   STRING_PREPEND(CMAKE_C_FLAGS_RELWITHDEBINFO   "${SECTIONS_FLAG} ")
diff --git a/SPECS/mysql.spec b/SPECS/mysql.spec
index 1954770..da09f84 100644
--- a/SPECS/mysql.spec
+++ b/SPECS/mysql.spec
@@ -19,7 +19,7 @@ ExcludeArch: %{ix86}
 # 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.44
+%global last_tested_version 8.0.45
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0
 
@@ -147,7 +147,7 @@ ExcludeArch: %{ix86}
 %endif
 
 Name:             %{?scl_prefix}mysql
-Version:          8.0.44
+Version:          8.0.45
 Release:          1%{?with_debug:.debug}%{?dist}
 Summary:          MySQL client programs and shared libraries
 URL:              http://www.mysql.com
@@ -211,6 +211,8 @@ Patch113:         boost-1.76.0-fix_multiprecision_issue_419-ppc64le.patch
 # Use same logfile path in logrotate and mysql configs
 Patch126: mysql-logrotate-log-path.patch
 
+Patch127: upstream_735bd2a53834266c7256830c8d34672ea55fe17b.patch
+
 BuildRequires:    cmake
 BuildRequires:    gcc-c++
 BuildRequires:    libaio-devel
@@ -521,6 +523,7 @@ the MySQL sources.
 %patch54 -p1
 %patch55 -p1
 %patch126 -p1
+%patch127 -p1
 
 # Patch Boost
 pushd boost/boost_$(echo %{boost_bundled_version}| tr . _)
@@ -1206,6 +1209,12 @@ fi
 %endif
 
 %changelog
+* Fri Jan 23 2026 Michal Schorm <mschorm@redhat.com> - 8.0.45-1
+- Rebase to 8.0.45
+
+* Mon Jan 12 2026 Pavol Sloboda <psloboda@redhat.com> - 8.0.44-2
+- Updated the Thread-local storage behaviour to avoid import issues
+
 * Thu Oct 30 2025 Pavol Sloboda <psloboda@redhat.com> - 8.0.44-1
 - Rebase to MySQL 8.0.44