From 8046f526872ea841978fd2b07041ae1fcc6b2fa5 Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Thu, 22 Feb 2024 12:20:32 +1100
Subject: [PATCH] 11.5 update

---
 11.5/Dockerfile |  2 ++
 versions.json   | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/11.5/Dockerfile b/11.5/Dockerfile
index 7c62ed68..1b6efb07 100644
--- a/11.5/Dockerfile
+++ b/11.5/Dockerfile
@@ -125,6 +125,8 @@ RUN set -ex; \
 		| xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \
 # don't reverse lookup hostnames, they are usually another container
 	printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \
+# Issue #560
+	sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \
 # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation)
 	if [ -L /etc/mysql/my.cnf ]; then \
 # 10.5+
diff --git a/versions.json b/versions.json
index fc529174..498f9121 100644
--- a/versions.json
+++ b/versions.json
@@ -123,5 +123,19 @@
       "arm64v8",
       "ppc64le"
     ]
+  },
+  "11.5": {
+    "milestone": "11.5",
+    "version": "11.5.0",
+    "fullVersion": "1:11.5.0+maria~ubu2204",
+    "releaseStatus": "Alpha",
+    "supportType": "Unknown",
+    "base": "ubuntu:jammy",
+    "arches": [
+      "amd64",
+      "arm64v8",
+      "ppc64le",
+      "s390x"
+    ]
   }
 }