Simplyfy overkill utf8mb4 settings

From https://dev.mysql.com/doc/refman/5.6/en/charset-connection.html

  A SET NAMES 'charset_name' statement is equivalent to these three statements:

  SET character_set_client = charset_name;
  SET character_set_results = charset_name;
  SET character_set_connection = charset_name;

Therefore it is probably overkill to have 'SET NAMES'.

Also using both - and _ in variable names in useless as they translate
to the same variable.

Author: ottok

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

@@ -85,15 +85,11 @@ max_binlog_size   = 100M
 #
 # * Character sets
 #
-# MySQL/MariaDB default is Latin1, but in Debian we rather default to the full 
+# 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
-collation_server       = utf8mb4_general_ci
-init-connect='SET NAMES utf8mb4'
-
 
 #
 # * Unix socket authentication plugin