Merge "mariadb: use utf8_general_ci collation as default"

openstack-helm-infra/centos/build_srpm.data

@@ -5,4 +5,4 @@ TAR="$TAR_NAME-$SHA.tar.gz"
 
 COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/*"
 
-TIS_PATCH_VER=15
+TIS_PATCH_VER=16

openstack-helm-infra/centos/openstack-helm-infra.spec

@@ -26,6 +26,7 @@ Patch08: 0008-Enable-override-of-rabbitmq-probe-parameters.patch
 Patch09: 0009-Fix-ipv6-address-issue-causing-mariadb-ingress-not-ready.patch
 Patch10: 0010-Fix-rabbitmq-could-not-bind-port-to-ipv6-address-iss.patch
 Patch11: 0011-Enable-override-of-mariadb-server-probe-parameters.patch
+Patch12: 0012-Mariadb-use-utf8_general_ci-collation-as-default.patch
 
 BuildRequires: helm
 
@@ -45,6 +46,7 @@ Openstack Helm Infra charts
 %patch09 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 # initialize helm and build the toolkit

openstack-helm-infra/files/0012-Mariadb-use-utf8_general_ci-collation-as-default.patch

@@ -0,0 +1,32 @@
+From 8e6de1efc32797f3ba1bc166b2b70992b3399022 Mon Sep 17 00:00:00 2001
+From: "Chen, Yan" <yan.chen@intel.com>
+Date: Fri, 29 May 2020 05:04:30 +0000
+Subject: [PATCH] mariadb: use utf8_general_ci collation as default
+
+Mariadb is using utf8_general_ci as the default collation:
+- https://mariadb.com/kb/en/mariadb/supported-character-sets-and-collations/
+
+Thus the collation server in the helm charts should be utf8_general_ci
+instead of utf8_unicode_ci.
+
+Signed-off-by: Chen, Yan <yan.chen@intel.com>
+---
+ mariadb/values.yaml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mariadb/values.yaml b/mariadb/values.yaml
+index c7a70d2..7bc4497 100755
+--- a/mariadb/values.yaml
++++ b/mariadb/values.yaml
+@@ -307,7 +307,7 @@ conf:
+       [mysqld]
+       # Charset
+       character_set_server=utf8
+-      collation_server=utf8_unicode_ci
++      collation_server=utf8_general_ci
+       skip-character-set-client-handshake
+ 
+       # Logging
+-- 
+1.8.3.1
+