From 3bce20b6374407f8e04570a13e4d71bc45a99a9d Mon Sep 17 00:00:00 2001
From: Andrew Bonney <andrew.bonney@bbc.co.uk>
Date: Tue, 14 Nov 2023 09:02:08 +0000
Subject: [PATCH] Fix ignored database directories configuration

Confusingly, the variable ignore_db_dirs is set by passing it
multiple times in the configuration file, once per directory.
It is then read as a comma separated list, but cannot be set
in this way.
https://mariadb.com/kb/en/server-system-variables/#ignore_db_dirs

Without this, the mariadb-upgrade script can fail as it attempts
to process invalid databases.

Change-Id: Ie997393935e04e127893643e4c72d7af07e993ff
(cherry picked from commit 229ae217c1e127979cd5370414e6d2b13c910055)
---
 templates/my.cnf.j2 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/templates/my.cnf.j2 b/templates/my.cnf.j2
index c58a038c..338ebf19 100644
--- a/templates/my.cnf.j2
+++ b/templates/my.cnf.j2
@@ -29,7 +29,9 @@ init-connect = 'SET NAMES utf8'
 character-set-server = utf8
 datadir = {{ galera_data_dir }}
 tmpdir = {{ galera_tmp_dir }}
-ignore_db_dirs = {{ galera_ignore_db_dirs | join(',') }}
+{% for ignored_db in galera_ignore_db_dirs %}
+ignore_db_dirs = {{ ignored_db }}
+{% endfor %}
 
 bind-address = {{ galera_server_bind_address }}
 {% if galera_server_proxy_protocol_networks %}