Unified config file layout with upstream .cnf layout

Now the packages mariadb-common, mariadb-client and mariadb-server each
install their own cnf file. A system will not have extra cnf files around.

Also the .cnf files list all possible stanzas that can be used to
compartmentalize settings for different binaries.

Role model was upstream
https://github.com/MariaDB/server/tree/83ba48b7c670f6dba465325cafd808c91f551544/support-files/rpm

Author: ottok

debian/additions/mariadb.cnf

@@ -12,6 +12,12 @@
 # Run program with --help to get a list of available options and with
 # --print-defaults to see which it would actually understand and use.
 
+#
+# This group is read both both by the client and the server
+# use it for options that affect everything
+#
+[client-server]
+
 # Import all .cnf files from configuration directory
 !includedir /etc/mysql/conf.d/
 !includedir /etc/mysql/mariadb.conf.d/

debian/additions/mariadb.conf.d/client.cnf

@@ -1,7 +1,15 @@
+#
+# This group is read by the client library
+# Use it for options that affect all clients, but not the server
+#
+
 [client]
 # Default is Latin1, if you need UTF-8 set this (also in server section)
 default-character-set = utf8mb4
 
-[mysql]
-default-character-set = utf8mb4
-
+# 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
+# client anyway.
+# If you use the same .cnf file for MySQL and MariaDB,
+# use it for MariaDB-only client options
+[client-mariadb]

debian/additions/mariadb.conf.d/mysql-clients.cnf

@@ -0,0 +1,24 @@
+#
+# These groups are read by MariaDB command-line tools
+# Use it for options that affect only one utility
+#
+
+[mysql]
+# Default is Latin1, if you need UTF-8 set this (also in server section)
+default-character-set = utf8mb4
+
+[mysql_upgrade]
+
+[mysqladmin]
+
+[mysqlbinlog]
+
+[mysqlcheck]
+
+[mysqldump]
+
+[mysqlimport]
+
+[mysqlshow]
+
+[mysqlslap]

debian/additions/mariadb.conf.d/mysqld.cnf renamed to debian/additions/mariadb.conf.d/server.cnf

@@ -1,4 +1,16 @@
+#
+# These groups are read by MariaDB server.
+# Use it for options that only the server (but not clients) should see
+#
+# See the examples of server my.cnf files in /usr/share/mysql/
+#
+
+# this is read by the standalone daemon and embedded servers
+[server]
+
+# this is only for the mysqld standalone daemon
 [mysqld]
+
 #
 # * Basic Settings
 #
@@ -100,3 +112,16 @@ collation-server      = utf8mb4_general_ci
 # Also available for other users if required.
 # See https://mariadb.com/kb/en/unix_socket-authentication-plugin/
 plugin-load-add         = auth_socket.so
+
+# this is only for embedded server
+[embedded]
+
+# 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]
+
+# This group is only read by MariaDB-10.0 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.0]

debian/mariadb-client-10.0.install

@@ -1,4 +1,5 @@
 debian/additions/innotop/innotop usr/bin/
+debian/additions/mariadb.conf.d/client.cnf etc/mysql/mariadb.conf.d
 debian/additions/mysqlreport usr/bin/
 usr/bin/mysql_find_rows
 usr/bin/mysql_fix_extensions

debian/mariadb-common.dirs

@@ -0,0 +1 @@
+etc/mysql/mariadb.conf.d

debian/mariadb-common.install

@@ -1,2 +1 @@
 debian/additions/mariadb.cnf etc/mysql/
-debian/additions/mariadb.conf.d etc/mysql/

debian/mariadb-server-10.0.install

@@ -1,6 +1,8 @@
 debian/additions/debian-start etc/mysql
 debian/additions/debian-start.inc.sh usr/share/mysql
 debian/additions/echo_stderr usr/share/mysql
+debian/additions/mariadb.conf.d/server.cnf etc/mysql/mariadb.conf.d
+debian/additions/mariadb.conf.d/mysqld_safe.cnf etc/mysql/mariadb.conf.d
 etc/apparmor.d/usr.sbin.mysqld
 usr/bin/aria_chk
 usr/bin/aria_dump_log