From 952642cd468799b52a9e8200cbf2b90d2b867d20 Mon Sep 17 00:00:00 2001
From: Andrew Garner <andrew.garner@broadcom.com>
Date: Thu, 20 Aug 2026 09:38:19 -0500
Subject: [PATCH 1/2] Revert "feat(pxc-mysql): Mitigate mysql bug #116741"

This reverts commit 22fb64fb7fe91ae442368754e743cec67266cb90.
---
 jobs/pxc-mysql/templates/my.cnf.erb | 21 ---------------------
 spec/pxc-mysql/mycnf_spec.rb        | 29 -----------------------------
 2 files changed, 50 deletions(-)

diff --git a/jobs/pxc-mysql/templates/my.cnf.erb b/jobs/pxc-mysql/templates/my.cnf.erb
index cd21038cd..8d1119d57 100644
--- a/jobs/pxc-mysql/templates/my.cnf.erb
+++ b/jobs/pxc-mysql/templates/my.cnf.erb
@@ -14,12 +14,6 @@
       section_entries
     end
 
-    def override_or_default(section, key, default)
-      section_entries = @entries[section]
-      return default unless section_entries.is_a?(Hash) && section_entries.key?(key)
-      section_entries.delete(key)
-    end
-
     def available_sections
       @entries.keys
     end
@@ -162,21 +156,6 @@ userstat                        = <%= bool_to_on_off(p('engine_config.userstat')
 
 max_heap_table_size             = <%= p('engine_config.max_heap_table_size') %>
 tmp_table_size                  = <%= p('engine_config.tmp_table_size') %>
-# TEMPORARY mitigation for https://bugs.mysql.com/bug.php?id=116741 (incorrect query
-# results when an in-memory temp table spills to an on-disk InnoDB temp table).
-# Fixed upstream in MySQL 8.4.11; remove once Percona XtraDB Cluster ships a v8.4.11-based
-# release (PXC typically lags upstream MySQL by 1-2 months) and revert to the v8.4 default
-# of disabling TempTable mmap (temptable_use_mmap=off), since both variables are deprecated
-# and slated for removal in MySQL 9.7.
-#
-# Deliberately hardcoded rather than exposed as new job properties: this is a short-lived
-# workaround, not a feature, and it can already be overridden per-deployment via the
-# existing engine_config.additional_raw_entries mechanism if needed.
-#
-# Note: on 8.4, temptable_max_mmap has no effect unless temptable_use_mmap is also on -
-# the "modern equivalent" framing in MySQL docs only applies starting in 9.7.
-temptable_use_mmap              = <%= additional_entries.override_or_default('mysqld', 'temptable_use_mmap', 'on') %>
-temptable_max_mmap              = <%= additional_entries.override_or_default('mysqld', 'temptable_max_mmap', '1G') %>
 
 default_storage_engine          = InnoDB
 innodb_autoinc_lock_mode        = 2
diff --git a/spec/pxc-mysql/mycnf_spec.rb b/spec/pxc-mysql/mycnf_spec.rb
index b366d37ae..6d8a4dd07 100644
--- a/spec/pxc-mysql/mycnf_spec.rb
+++ b/spec/pxc-mysql/mycnf_spec.rb
@@ -47,35 +47,6 @@
     end
   }
 
-  it 'temporarily enabled deprecated TempTable mmap options to mitigate https://bugs.mysql.com/bug.php?id=116741' do
-      expect(parsed_mycnf).to include("mysqld" => hash_including(
-        "temptable_use_mmap" => "on",
-        "temptable_max_mmap" => "1G"
-      ))
-  end
-
-  context 'when a user overrides temptable settings' do
-    let(:spec) {
-      {
-        "engine_config" => {
-          "additional_raw_entries" => {
-            "mysqld" => {
-              "temptable_use_mmap" => "off",  # prove we can turn temptable mmap back off, if desired
-              "some-other-option" => "some-value", # prove some other override option works too
-            }
-          }
-        }
-      }
-    }
-
-    it 'uses the overrides' do
-      expect(parsed_mycnf).to include("mysqld" => hash_including(
-        "temptable_use_mmap" => "off",
-        "some-other-option" => "some-value"
-      ))
-    end
-  end
-
   it 'sets the authentication policy to what is provided in the job spec' do
       expect(parsed_mycnf).to include("mysqld" => hash_including("authentication_policy" => "caching_sha2_password"))
   end

From 56c0c34c19e0a2c6948a9ad0517cd90558991b31 Mon Sep 17 00:00:00 2001
From: Andrew Garner <andrew.garner@broadcom.com>
Date: Wed, 19 Aug 2026 20:43:05 -0500
Subject: [PATCH 2/2] fix: bump to custom Percona XtraDB Cluster v8.4.10-10

PXC v8.4.10-10, with a backported fix for
[MySQL bug #116741](https://bugs.mysql.com/116741)
---
 config/blobs.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/blobs.yml b/config/blobs.yml
index 53c8ff80c..4822027b3 100644
--- a/config/blobs.yml
+++ b/config/blobs.yml
@@ -2,10 +2,10 @@ Percona-XtraDB-Cluster-8.0.46-38.tar.gz:
   size: 529960552
   object_id: f2fcfd15-4847-4cb9-4cc5-7a28b445e95a
   sha: sha256:759250a166681eb4d2025a1c8c68ce9bc483fbd982ec4b061b1bcf07d3e2fff9
-Percona-XtraDB-Cluster-8.4.10-10.tar.gz:
-  size: 507260341
-  object_id: 775580cb-1bcd-4b93-59db-a2e9c61a3ecd
-  sha: sha256:02eecdb76572704967788fb090fc62d8acfdc6a474f85c9cbfb22e9db0942945
+Percona-XtraDB-Cluster-8.4.10-10-fix116741.tar.gz:
+  size: 507207675
+  object_id: a3cf39cd-c685-45a8-5ff4-a459e2af4502
+  sha: sha256:362e0ad02bfac2e629f2b10d8cacbc0b17d112212076b35047405e175b9829bc
 boost_1_77_0.tar.bz2:
   size: 110361537
   object_id: d962752f-1ab7-4896-41d9-8deed29397ca