From 2dd151f47a6ee23a06f21a2e30d2a0b60cbe9f97 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Tue, 6 Aug 2024 21:30:21 +0200
Subject: [PATCH] revert MariaDB to 10.x release series

puppetlabs-mysql is currently incompatble with MariaDB 11.x:
https://github.com/puppetlabs/puppetlabs-mysql/pull/1626
---
 CHANGELOG.md                           | 4 +++-
 data/common.yaml                       | 2 +-
 spec/acceptance/galera_mariadb_spec.rb | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 367c838..f5b3a02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * Add support for new operating systems
 
 ### Changed
-* Change default version of Codership/MySQL, MariaDB and Percona XtraDB
+* Change default version of Codership/MySQL to 8.0
+* Change default version of MariaDB to 10.11
+* Change default version of Percona XtraDB to 8.0
 * Enable systemd-based status check on RHEL 9, Debian 12 and Ubuntu 24.04 ([#191])
 * Add new dependency for systemd-based status check ([#191])
 * Extend unit tests ([#191])
diff --git a/data/common.yaml b/data/common.yaml
index 7a565fc..358ba4a 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -100,7 +100,7 @@ galera::codership::galera_package_ensure: 'present'
 galera::percona::default_version: '8.0'
 # Percona does not allow installation of wsrep-enabled server and wsrep provider.
 galera::percona::galera_package_ensure: 'absent'
-galera::mariadb::default_version: '11.4'
+galera::mariadb::default_version: '10.11'
 galera::mariadb::galera_package_ensure: 'present'
 
 # binlog_format is deprecated in MySQL, but still required for MariaDB
diff --git a/spec/acceptance/galera_mariadb_spec.rb b/spec/acceptance/galera_mariadb_spec.rb
index 64a2f53..b5b64b7 100644
--- a/spec/acceptance/galera_mariadb_spec.rb
+++ b/spec/acceptance/galera_mariadb_spec.rb
@@ -25,7 +25,9 @@ class { 'galera':
             }
           },
           vendor_type           => 'mariadb',
-          vendor_version        => '11.4'
+          # FIXME: switch to 11.4, requires this PR:
+          # https://github.com/puppetlabs/puppetlabs-mysql/pull/1626
+          vendor_version        => '10.11'
         }
         MANIFEST
       end