daily autocommit

diff --git a/.etckeeper b/.etckeeper
index 2649d898c99f128b06d2fa43521dbafefa1cf368..95f8a73b8103a9480b2071912a89e37d32741bfc 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -584,6 +584,11 @@ maybe chmod 0755 'modules-load.d'
 maybe chmod 0644 'modules-load.d/.keep_sys-apps_systemd-0'
 maybe chmod 0644 'motd.tail'
 maybe chmod 0755 'mysql'
+maybe chmod 0755 'mysql/conf.d'
+maybe chmod 0644 'mysql/conf.d/mariadb.cnf'
+maybe chmod 0644 'mysql/conf.d/mysqld_safe_syslog.cnf'
+maybe chmod 0644 'mysql/conf.d/plugins.cnf'
+maybe chmod 0644 'mysql/conf.d/tokudb.cnf'
 maybe chmod 0644 'mysql/my.cnf'
 maybe chmod 0644 'mysql/mysqlaccess.conf'
 maybe chmod 0644 'nail.rc'

diff --git a/mysql/conf.d/mariadb.cnf b/mysql/conf.d/mariadb.cnf
new file mode 100644 (file)
index 0000000..b3b4fa6
--- /dev/null
+++ b/mysql/conf.d/mariadb.cnf
@@ -0,0 +1,19 @@
+# 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]
+#
+# * Character sets
+# 
+# Default is Latin1, if you need UTF-8 set all this (also in client section)
+#
+#character-set-server  = utf8 
+#collation-server      = utf8_general_ci 
+#character_set_server   = utf8 
+#collation_server       = utf8_general_ci 
+
+# vim: filetype=dosini

diff --git a/mysql/conf.d/mysqld_safe_syslog.cnf b/mysql/conf.d/mysqld_safe_syslog.cnf
new file mode 100644 (file)
index 0000000..f49b15c
--- /dev/null
+++ b/mysql/conf.d/mysqld_safe_syslog.cnf
@@ -0,0 +1,5 @@
+[mysqld_safe]
+#skip_log_error
+#syslog
+
+# vim: filetype=dosini

diff --git a/mysql/conf.d/plugins.cnf b/mysql/conf.d/plugins.cnf
new file mode 100644 (file)
index 0000000..13a637b
--- /dev/null
+++ b/mysql/conf.d/plugins.cnf
@@ -0,0 +1,11 @@
+[mariadb]
+
+plugin-load-add = ha_federatedx.so
+plugin-load-add = locales.so
+plugin-load-add = query_cache_info.so
+plugin-load-add = query_response_time.so
+plugin-load-add = sql_errlog.so
+plugin-load-add = ha_oqgraph.so
+
+
+# vim: filetype=dosini

diff --git a/mysql/conf.d/tokudb.cnf b/mysql/conf.d/tokudb.cnf
new file mode 100644 (file)
index 0000000..a7ddf6e
--- /dev/null
+++ b/mysql/conf.d/tokudb.cnf
@@ -0,0 +1,10 @@
+[mariadb]
+# See https://mariadb.com/kb/en/how-to-enable-tokudb-in-mariadb/
+# for instructions how to enable TokuDB
+#
+# See https://mariadb.com/kb/en/tokudb-differences/ for differences
+# between TokuDB in MariaDB and TokuDB from http://www.tokutek.com/
+
+plugin-load-add = ha_tokudb.so
+
+# vim: filetype=dosini

diff --git a/mysql/my.cnf b/mysql/my.cnf
index f937afbca9f2f4357794c70f421465054f7c8998..28ee79e5cee2b21ae906dd6c4327008c1f5a04b3 100644 (file)
--- a/mysql/my.cnf
+++ b/mysql/my.cnf
@@ -119,6 +119,8 @@ innodb_file_per_table
 #plugin-load=federated=ha_federated.so
 loose-federated
 
+userstat = 1
+
 [mysqldump]
 quick
 max_allowed_packet                     = 16M
@@ -143,3 +145,11 @@ write_buffer_size                  = 2M
 interactive-timeout
 
 [mariadb]
+
+#
+# * IMPORTANT: Additional settings that can override those from this file!
+#   The files must end with '.cnf', otherwise they'll be ignored.
+#
+!includedir /etc/mysql/conf.d/
+
+# vim: filetype=dosini