Merging debian version 1:11.4.2-1.HEADprogress-linux

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

	debian/control
	debian/libmariadbd19.install
	debian/libmariadbd19.lintian-overrides
	debian/salsa-ci.yml

5 files changed, 31 insertions, 31 deletions

diff --git a/debian/additions/debian-start b/debian/additions/debian-start
index d85e4a12..282cd209 100755
--- a/debian/additions/debian-start
+++ b/debian/additions/debian-start
@@ -7,7 +7,7 @@
 #
 
 # shellcheck source=debian/additions/debian-start.inc.sh
-source /usr/share/mysql/debian-start.inc.sh
+source /usr/share/mariadb/debian-start.inc.sh
 
 # Read default/mysql first and then default/mariadb just like the init.d file does
 if [ -f /etc/default/mysql ]
diff --git a/debian/additions/mariadb.conf.d/50-mariadb-clients.cnf b/debian/additions/mariadb.conf.d/50-mariadb-clients.cnf
new file mode 100644
index 00000000..3c4fad87
--- /dev/null
+++ b/debian/additions/mariadb.conf.d/50-mariadb-clients.cnf
@@ -0,0 +1,22 @@
+#
+# These groups are read by MariaDB command-line tools
+# Use it for options that affect only one utility
+#
+
+[mariadb-client]
+
+[mariadb-upgrade]
+
+[mariadb-admin]
+
+[mariadb-binlog]
+
+[mariadb-check]
+
+[mariadb-dump]
+
+[mariadb-import]
+
+[mariadb-show]
+
+[mariadb-slap]
diff --git a/debian/additions/mariadb.conf.d/50-mysql-clients.cnf b/debian/additions/mariadb.conf.d/50-mysql-clients.cnf
deleted file mode 100644
index 2f5a3605..00000000
--- a/debian/additions/mariadb.conf.d/50-mysql-clients.cnf
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# These groups are read by MariaDB command-line tools
-# Use it for options that affect only one utility
-#
-
-[mysql]
-
-[mysql_upgrade]
-
-[mysqladmin]
-
-[mysqlbinlog]
-
-[mysqlcheck]
-
-[mysqldump]
-
-[mysqlimport]
-
-[mysqlshow]
-
-[mysqlslap]
diff --git a/debian/additions/mariadb.conf.d/50-server.cnf b/debian/additions/mariadb.conf.d/50-server.cnf
index 4805c550..1fca97ae 100644
--- a/debian/additions/mariadb.conf.d/50-server.cnf
+++ b/debian/additions/mariadb.conf.d/50-server.cnf
@@ -5,8 +5,8 @@
 # this is read by the standalone daemon and embedded servers
 [server]
 
-# this is only for the mysqld standalone daemon
-[mysqld]
+# this is only for the mariadbd daemon
+[mariadbd]
 
 #
 # * Basic Settings
@@ -92,8 +92,8 @@ expire_logs_days        = 10
 
 # MySQL/MariaDB default is Latin1, but in Debian we rather default to the full
 # utf8 4-byte character set. See also client.cnf
-character-set-server  = utf8mb4
-collation-server      = utf8mb4_general_ci
+character-set-server     = utf8mb4
+character-set-collations = utf8mb4=uca1400_ai_ci
 
 #
 # * InnoDB
@@ -111,9 +111,9 @@ collation-server      = utf8mb4_general_ci
 # This group is only read by MariaDB servers, not by MySQL.
 # If you use the same .cnf file for MySQL and MariaDB,
 # you can put MariaDB-only options here
-[mariadb]
+[mariadbd]
 
-# This group is only read by MariaDB-10.11 servers.
+# This group is only read by MariaDB-11.4 servers.
 # If you use the same .cnf file for MariaDB of different versions,
 # use this group for options that older servers don't understand
-[mariadb-10.11]
+[mariadb-11.4]
diff --git a/debian/additions/mariadb.conf.d/60-galera.cnf b/debian/additions/mariadb.conf.d/60-galera.cnf
index 274891b1..67ccb3ed 100644
--- a/debian/additions/mariadb.conf.d/60-galera.cnf
+++ b/debian/additions/mariadb.conf.d/60-galera.cnf
@@ -1,7 +1,7 @@
 #
 # * Galera-related settings
 #
-# See the examples of server wsrep.cnf files in /usr/share/mysql
+# See the examples of server wsrep.cnf files in /usr/share/mariadb
 # and read more at https://mariadb.com/kb/en/galera-cluster/
 
 [galera]