Commit b8584e14 authored by Yusei Tahara's avatar Yusei Tahara

erp5: add mariadb `character-set-server` and `collation-server` options.

parent 233c0dc1
Pipeline #19691 failed with stage
in 0 seconds
...@@ -111,6 +111,16 @@ ...@@ -111,6 +111,16 @@
"default": false, "default": false,
"type": "boolean" "type": "boolean"
}, },
"character-set-server": {
"description": "The server default character set",
"default": "utf8mb4",
"type": "string"
},
"collation-server": {
"description": "The server default collation",
"default": "utf8mb4_general_ci",
"type": "string"
},
"ssl": { "ssl": {
"description": "Enable and define SSL support for network connections", "description": "Enable and define SSL support for network connections",
"default": {}, "default": {},
......
...@@ -26,7 +26,7 @@ md5sum = d10b8e35b02b5391cf46bf0c7dbb1196 ...@@ -26,7 +26,7 @@ md5sum = d10b8e35b02b5391cf46bf0c7dbb1196
[template-mariadb] [template-mariadb]
filename = instance-mariadb.cfg.in filename = instance-mariadb.cfg.in
md5sum = 2daa3aaa1263705c4628864230049c67 md5sum = b664a2221077db5db498422b6c90f015
[template-kumofs] [template-kumofs]
filename = instance-kumofs.cfg.in filename = instance-kumofs.cfg.in
...@@ -42,7 +42,7 @@ md5sum = 43556e5bca8336dd543ae8068512aa6d ...@@ -42,7 +42,7 @@ md5sum = 43556e5bca8336dd543ae8068512aa6d
[template-my-cnf] [template-my-cnf]
filename = my.cnf.in filename = my.cnf.in
md5sum = 1de449e8c0c4a85c5ce2b447785b7654 md5sum = c0bde08ec6bd6d333315a15026266b65
[template-mariadb-initial-setup] [template-mariadb-initial-setup]
filename = mariadb_initial_setup.sql.in filename = mariadb_initial_setup.sql.in
......
...@@ -142,6 +142,8 @@ innodb-log-file-size = {{ dumps(slapparameter_dict.get('innodb-log-file-size', 0 ...@@ -142,6 +142,8 @@ innodb-log-file-size = {{ dumps(slapparameter_dict.get('innodb-log-file-size', 0
innodb-file-per-table = {{ dumps(slapparameter_dict.get('innodb-file-per-table', 0)) }} innodb-file-per-table = {{ dumps(slapparameter_dict.get('innodb-file-per-table', 0)) }}
innodb-log-buffer-size = {{ dumps(slapparameter_dict.get('innodb-log-buffer-size', 0)) }} innodb-log-buffer-size = {{ dumps(slapparameter_dict.get('innodb-log-buffer-size', 0)) }}
relaxed-writes = {{ dumps(slapparameter_dict.get('relaxed-writes', False)) }} relaxed-writes = {{ dumps(slapparameter_dict.get('relaxed-writes', False)) }}
character-set-server = {{ dumps(slapparameter_dict.get('character-set-server', 'utf8mb4')) }}
collation-server = {{ dumps(slapparameter_dict.get('collation-server', 'utf8mb4_general_ci')) }}
{% if incremental_backup_retention_days > -1 -%} {% if incremental_backup_retention_days > -1 -%}
binlog-path = ${directory:mariadb-backup-incremental}/binlog binlog-path = ${directory:mariadb-backup-incremental}/binlog
# XXX: binlog rotation happens along with other log's rotation # XXX: binlog rotation happens along with other log's rotation
......
...@@ -76,9 +76,8 @@ relay-log = mariadb-relay-bin ...@@ -76,9 +76,8 @@ relay-log = mariadb-relay-bin
{{x}}innodb_doublewrite = 0 {{x}}innodb_doublewrite = 0
{{x}}sync_frm = 0 {{x}}sync_frm = 0
# Force utf8 usage character_set_server = {{ parameter_dict['character-set-server'] }}
character_set_server = utf8mb4 collation_server = {{ parameter_dict['collation-server'] }}
collation_server = utf8mb4_general_ci
skip_character_set_client_handshake skip_character_set_client_handshake
{% if 'ssl-key' in parameter_dict -%} {% if 'ssl-key' in parameter_dict -%}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment