UBI default config adjusted by MDEV-34430 (collation) and MDEV-19123 …

…charset
MariaDB · Jun 20, 2024 · 1c10627 · 1c10627
1 parent a8aeff3
commit 1c10627
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/11.4-ubi/docker.cnf b/11.4-ubi/docker.cnf
@@ -7,7 +7,7 @@ skip-name-resolve
 expire_logs_days=10
 character-set-server=utf8mb4
 
-character-set-collations=utf8mb4=uca1400_ai_ci # 11.3+
+character-set-collations=utf8mb4=uca1400_ai_ci # 11.3, 11.4
 
 [client-server]
 socket=/run/mariadb/mariadb.sock

diff --git a/11.5-ubi/docker.cnf b/11.5-ubi/docker.cnf
@@ -7,7 +7,6 @@ skip-name-resolve
 expire_logs_days=10
 character-set-server=utf8mb4
 
-character-set-collations=utf8mb4=uca1400_ai_ci # 11.3+
 
 [client-server]
 socket=/run/mariadb/mariadb.sock

diff --git a/11.6-ubi/docker.cnf b/11.6-ubi/docker.cnf
@@ -5,9 +5,7 @@ host-cache-size=0
 skip-name-resolve
 
 expire_logs_days=10
-character-set-server=utf8mb4
 
-character-set-collations=utf8mb4=uca1400_ai_ci # 11.3+
 
 [client-server]
 socket=/run/mariadb/mariadb.sock

diff --git a/docker.cnf b/docker.cnf
@@ -7,7 +7,7 @@ skip-name-resolve
 expire_logs_days=10
 character-set-server=utf8mb4
 
-character-set-collations=utf8mb4=uca1400_ai_ci # 11.3+
+character-set-collations=utf8mb4=uca1400_ai_ci # 11.3, 11.4
 collation-server=utf8mb4_general_ci # 10*
 
 [client-server]

diff --git a/update.sh b/update.sh
@@ -55,6 +55,12 @@ update_version()
 			sed -e '/character-set-collations/d' docker.cnf > "$dir/docker.cnf"
 		else
 			sed -e '/collation-server/d' docker.cnf > "$dir/docker.cnf"
+			if [[ $version != 11.4 ]]; then
+				sed -i -e '/character-set-collations/d' "$dir/docker.cnf"
+			fi
+			if [[ $version != 11.[45] ]]; then
+				sed -i -e '/character-set/d' "$dir/docker.cnf"
+			fi
 		fi
 		sed -e "s!%%MARIADB_VERSION%%!${version%-*}!" MariaDB-ubi.repo > "$dir"/MariaDB.repo
 	fi