From: root <root@localhost>
Date: Fri, 14 Jun 2019 18:52:18 +0000 (+0200)
Subject: committing changes in /etc after apt run
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=371b0263b45a2f9e6e62450c34374e5d75ada871;p=zenbook

committing changes in /etc after apt run

Package changes:
-galera-3 25.3.20-1 amd64
+galera-3 25.3.26-bionic amd64
-mariadb-common 1:10.1.40-0ubuntu0.18.04.1 all
+mariadb-common 1:10.3.15+maria~bionic all
-mysql-common 5.8+1.0.4 all
+mysql-common 1:10.3.15+maria~bionic all
---

diff --git a/mysql/mariadb.cnf b/mysql/mariadb.cnf
index 94d8f10..da21212 100644
--- a/mysql/mariadb.cnf
+++ b/mysql/mariadb.cnf
@@ -1,23 +1,19 @@
-# The MariaDB configuration file
-#
-# The MariaDB/MySQL tools read configuration files in the following order:
-# 1. "/etc/mysql/mariadb.cnf" (this file) to set global defaults,
-# 2. "/etc/mysql/conf.d/*.cnf" to set global options.
-# 3. "/etc/mysql/mariadb.conf.d/*.cnf" to set MariaDB-only options.
-# 4. "~/.my.cnf" to set user-specific options.
-#
-# If the same option is defined multiple times, the last one will apply.
-#
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
+# MariaDB-specific config file.
+# Read by /etc/mysql/my.cnf
 
+[client]
+# Default is Latin1, if you need UTF-8 set this (also in server section)
+#default-character-set = utf8 
+
+[mysqld]
 #
-# This group is read both both by the client and the server
-# use it for options that affect everything
+# * Character sets
+# 
+# Default is Latin1, if you need UTF-8 set all this (also in client section)
 #
-[client-server]
-
+#character-set-server  = utf8 
+#collation-server      = utf8_general_ci 
+#character_set_server   = utf8 
+#collation_server       = utf8_general_ci 
 # Import all .cnf files from configuration directory
-!includedir /etc/mysql/conf.d/
 !includedir /etc/mysql/mariadb.conf.d/