From 918e4c3bee3c36cdf1c8006444be40eb85ec3a8f Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <359867+desrosj@users.noreply.github.com>
Date: Thu, 5 Nov 2026 06:40:29 -0500
Subject: [PATCH 1/2] Build/Test Tools: Add MySQL 26.10 to relevant test
 matrices.

This adds the MySQL 26.10 innovation release to the relevant testing strategies.

Because MySQL 9.7 is an LTS release, some of the innovation release handling was removed when it was added in r62407. This restores that handling for 26.10.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .github/workflows/install-testing.yml | 4 ++++
 .github/workflows/phpunit-tests.yml   | 4 +++-
 .github/workflows/upgrade-testing.yml | 4 ++--
 .version-support-mysql.json           | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/install-testing.yml b/.github/workflows/install-testing.yml
index 44074c0e02b52..4b14bcba8c0b5 100644
--- a/.github/workflows/install-testing.yml
+++ b/.github/workflows/install-testing.yml
@@ -111,6 +111,10 @@ jobs:
             db-version: '9.7'
           - php: '7.3'
             db-version: '9.7'
+          - php: '7.2'
+            db-version: '26.10'
+          - php: '7.3'
+            db-version: '26.10'
 
     services:
       database:
diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
index 68f24fb48d9ae..aabf75a1b47d1 100644
--- a/.github/workflows/phpunit-tests.yml
+++ b/.github/workflows/phpunit-tests.yml
@@ -412,7 +412,7 @@ jobs:
         os: [ ubuntu-24.04 ]
         php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
         db-type: [ 'mysql', 'mariadb' ]
-        db-version: [ '12.1' ]
+        db-version: [ '26.10', '12.1' ]
         multisite: [ false, true ]
         memcached: [ false ]
         db-innovation: [ true ]
@@ -423,6 +423,8 @@ jobs:
 
         exclude:
           # Exclude version combinations that don't exist.
+          - db-type: 'mariadb'
+            db-version: '26.10'
           - db-type: 'mysql'
             db-version: '12.1'
           # Outside the full matrix, only the highest and lowest PHP version of each major are tested.
diff --git a/.github/workflows/upgrade-testing.yml b/.github/workflows/upgrade-testing.yml
index 2add565b4772a..7672a21a8c6d7 100644
--- a/.github/workflows/upgrade-testing.yml
+++ b/.github/workflows/upgrade-testing.yml
@@ -166,7 +166,7 @@ jobs:
         os: [ 'ubuntu-24.04' ]
         php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
         db-type: [ 'mysql' ]
-        db-version: [ '5.7', '8.0', '8.4', '9.7' ]
+        db-version: [ '5.7', '8.0', '8.4', '9.7', '26.10' ]
         wp: ${{ fromJSON( needs.build-test-matrix.outputs.recent-releases ) }}
         multisite: [ false, true ]
     with:
@@ -279,7 +279,7 @@ jobs:
         os: [ 'ubuntu-24.04' ]
         php: [ '7.4' ]
         db-type: [ 'mysql' ]
-        db-version: [ '5.7', '8.0', '8.4', '9.7' ]
+        db-version: [ '5.7', '8.0', '8.4', '9.7', '26.10' ]
         wp: ${{ fromJSON( needs.build-test-matrix.outputs.oldest-wp ) }}
         multisite: [ false, true ]
     with:
diff --git a/.version-support-mysql.json b/.version-support-mysql.json
index c7bda38ff5fe9..555dd0c3aa2f8 100644
--- a/.version-support-mysql.json
+++ b/.version-support-mysql.json
@@ -1,5 +1,6 @@
 {
 	"7-2": [
+		"26.10",
 		"9.7",
 		"8.4",
 		"8.0",

From dc527eed01b422f07855085fc8a6ef42797ba528 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <359867+desrosj@users.noreply.github.com>
Date: Thu, 5 Nov 2026 06:41:10 -0500
Subject: [PATCH 2/2] Build/Test Tools: List MySQL 26.7 as supported for 7.2.

MySQL 26.7 is added to the supported versions list but excluded from the install and local Docker environment test matrices, as only the most recent innovation release is tested.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .github/workflows/install-testing.yml          | 1 +
 .github/workflows/local-docker-environment.yml | 1 +
 .version-support-mysql.json                    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/.github/workflows/install-testing.yml b/.github/workflows/install-testing.yml
index 4b14bcba8c0b5..e445efbad1e76 100644
--- a/.github/workflows/install-testing.yml
+++ b/.github/workflows/install-testing.yml
@@ -106,6 +106,7 @@ jobs:
           - db-version: '9.4'
           - db-version: '9.5'
           - db-version: '9.6'
+          - db-version: '26.7'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
             db-version: '9.7'
diff --git a/.github/workflows/local-docker-environment.yml b/.github/workflows/local-docker-environment.yml
index cf50ce28185c6..7d9329462819d 100644
--- a/.github/workflows/local-docker-environment.yml
+++ b/.github/workflows/local-docker-environment.yml
@@ -113,6 +113,7 @@ jobs:
           - db-version: '9.4'
           - db-version: '9.5'
           - db-version: '9.6'
+          - db-version: '26.7'
           # No PHP 8.5 + Memcached support yet.
           - php: '8.5'
             memcached: true
diff --git a/.version-support-mysql.json b/.version-support-mysql.json
index 555dd0c3aa2f8..68c6d2ac77407 100644
--- a/.version-support-mysql.json
+++ b/.version-support-mysql.json
@@ -1,6 +1,7 @@
 {
 	"7-2": [
 		"26.10",
+		"26.7",
 		"9.7",
 		"8.4",
 		"8.0",