From 27a66f077495af1847ce1c10a3e4ea4aa415f89d Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Wed, 16 Jul 2025 12:17:35 +1000
Subject: [PATCH 1/2] Update test matrx to include MariaDB 11

MariaDB has had a 11 release for a while and this includes a 11.8 LTS release which is under the :11 tag.

MariaDB:11+ doesn't include a mysql executable so used
its own healthcheck.sh to wait for startup with timeout.
---
 .github/workflows/ci.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 34e1a3f..e90943c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,6 +31,8 @@ jobs:
             rdbms: mysql:9
           - php: 8.4
             rdbms: mysql:8
+          - php: 8.4
+            rdbms: mariadb:11
           - php: 8.4
             rdbms: mariadb:10
     steps:
@@ -43,6 +45,20 @@ jobs:
       - run: composer install
       - run: docker run -d --name mysql --net=host -e MYSQL_RANDOM_ROOT_PASSWORD=yes -e MYSQL_DATABASE=test -e MYSQL_USER=test -e MYSQL_PASSWORD=test ${{ matrix.rdbms }}
       - run: bash tests/wait-for-mysql.sh
+        if: startsWith(matrix.rdbms, 'mysql:')
+      - run: |
+          MAX_RETRIES=20
+          until docker exec mysql healthcheck.sh --connect; do
+            ((MAX_RETRIES--))
+            if [ $MAX_RETRIES -le 0 ]; then
+              echo "MariaDB did not become healthy in time."
+              exit 1
+            fi
+            echo "MariaDB not healthy yet. Retries left: $MAX_RETRIES"
+            sleep 1
+          done
+          echo "MariaDB is healthy."
+        if: startsWith(matrix.rdbms, 'mariadb:')
       - run: vendor/bin/phpunit --coverage-text
         if: ${{ matrix.php >= 7.3 }}
       - run: vendor/bin/phpunit --coverage-text -c phpunit.xml.legacy

From 5dfb577608d9cbd21a8c772413490dc2e5607ba8 Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Thu, 23 Oct 2025 07:45:16 +1100
Subject: [PATCH 2/2] Update test matrix to include MariaDB 11

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e90943c..b2382ef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,6 +31,8 @@ jobs:
             rdbms: mysql:9
           - php: 8.4
             rdbms: mysql:8
+          - php: 8.4
+            rdbms: mariadb:12
           - php: 8.4
             rdbms: mariadb:11
           - php: 8.4