summaryrefslogtreecommitdiff
path: root/debian/additions
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-05-21 15:44:54 +0200
committerSergei Golubchik <serg@mariadb.org>2018-05-22 13:11:14 +0200
commit2609783aace3bf73a8bcfa01231f47b19fbc224b (patch)
treebcf6b8e46ebc59badd66c7834fcb36c70e972c5b /debian/additions
parentaa5683d12e653a743f89b3ace87c62b97bd96dd2 (diff)
downloadmariadb-git-2609783aace3bf73a8bcfa01231f47b19fbc224b.tar.gz
MDEV-15627 debian packages install /etc/mysql/mariadb.cnf however its not read by default
Diffstat (limited to 'debian/additions')
-rw-r--r--debian/additions/my.cnf1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/additions/my.cnf b/debian/additions/my.cnf
index d30ec182c8b..91a159e4669 100644
--- a/debian/additions/my.cnf
+++ b/debian/additions/my.cnf
@@ -186,4 +186,5 @@ key_buffer = 16M
# * IMPORTANT: Additional settings that can override those from this file!
# The files must end with '.cnf', otherwise they'll be ignored.
#
+!include /etc/mysql/mariadb.cnf
!includedir /etc/mysql/conf.d/