Merge 10.5 into 10.6

4 files changed, 11 insertions, 11 deletions

diff --git a/debian/additions/debian-start b/debian/additions/debian-start
index e00684d6c54..ffe635dc883 100755
--- a/debian/additions/debian-start
+++ b/debian/additions/debian-start
@@ -1,11 +1,10 @@
 #!/bin/bash
 #
-# This script is executed by "/etc/init.d/mariadb" on every (re)start.
+# This script is executed by both SysV init /etc/init.d/mariadb and
+# systemd mariadb.service on every (re)start.
 #
 # Changes to this file will be preserved when updating the Debian package.
 #
-# NOTE: This file is read only by the traditional SysV init script, not systemd.
-#
 
 source /usr/share/mysql/debian-start.inc.sh
 
diff --git a/debian/additions/mariadb.conf.d/50-client.cnf b/debian/additions/mariadb.conf.d/50-client.cnf
index 54cfb44ac2d..1fd4685df22 100644
--- a/debian/additions/mariadb.conf.d/50-client.cnf
+++ b/debian/additions/mariadb.conf.d/50-client.cnf
@@ -5,11 +5,11 @@
 
 [client]
 # Example of client certificate usage
-# ssl-cert = /etc/mysql/client-cert.pem
-# ssl-key = /etc/mysql/client-key.pem
+#ssl-cert = /etc/mysql/client-cert.pem
+#ssl-key  = /etc/mysql/client-key.pem
 #
 # Allow only TLS encrypted connections
-# ssl-verify-server-cert = on
+#ssl-verify-server-cert = on
 
 # This group is *never* read by mysql client library, though this
 # /etc/mysql/mariadb.cnf.d/client.cnf file is not read by Oracle MySQL
diff --git a/debian/additions/mariadb.conf.d/50-server.cnf b/debian/additions/mariadb.conf.d/50-server.cnf
index 807eff8bba7..1d9344c756a 100644
--- a/debian/additions/mariadb.conf.d/50-server.cnf
+++ b/debian/additions/mariadb.conf.d/50-server.cnf
@@ -82,6 +82,7 @@ expire_logs_days        = 10
 #ssl-ca = /etc/mysql/cacert.pem
 #ssl-cert = /etc/mysql/server-cert.pem
 #ssl-key = /etc/mysql/server-key.pem
+#require-secure-transport = on
 
 #
 # * Character sets
diff --git a/debian/additions/mariadb.conf.d/60-galera.cnf b/debian/additions/mariadb.conf.d/60-galera.cnf
index 55d7c0b0322..274891b1313 100644
--- a/debian/additions/mariadb.conf.d/60-galera.cnf
+++ b/debian/additions/mariadb.conf.d/60-galera.cnf
@@ -6,11 +6,11 @@
 
 [galera]
 # Mandatory settings
-#wsrep_on = ON
-#wsrep_provider =
-#wsrep_cluster_address =
-#binlog_format = row
-#default_storage_engine = InnoDB
+#wsrep_on                 = ON
+#wsrep_cluster_name       = "MariaDB Galera Cluster"
+#wsrep_cluster_address    = gcomm://
+#binlog_format            = row
+#default_storage_engine   = InnoDB
 #innodb_autoinc_lock_mode = 2
 
 # Allow server to accept connections on all interfaces.