summaryrefslogtreecommitdiff
path: root/debian/additions
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-11-25 08:47:54 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-11-25 08:47:54 +0200
commitc41cbfaf1ac17e6e36ea78fe2991d86d1f188465 (patch)
treeba985247025cd10a67bc401716af0df943a5b460 /debian/additions
parent6a282df0bee033266942fb891ded629c05db44b5 (diff)
parent5f160b4d864866e30f49bac2ee4f51b4cf530a86 (diff)
downloadmariadb-git-c41cbfaf1ac17e6e36ea78fe2991d86d1f188465.tar.gz
Merge 10.7 into 10.8
Diffstat (limited to 'debian/additions')
-rw-r--r--debian/additions/mariadb.conf.d/50-server.cnf9
1 files changed, 3 insertions, 6 deletions
diff --git a/debian/additions/mariadb.conf.d/50-server.cnf b/debian/additions/mariadb.conf.d/50-server.cnf
index 54077dbb6b1..28e37445888 100644
--- a/debian/additions/mariadb.conf.d/50-server.cnf
+++ b/debian/additions/mariadb.conf.d/50-server.cnf
@@ -12,14 +12,11 @@
# * Basic Settings
#
-user = mysql
+#user = mysql
pid-file = /run/mysqld/mysqld.pid
basedir = /usr
-datadir = /var/lib/mysql
-tmpdir = /tmp
-lc-messages-dir = /usr/share/mysql
-lc-messages = en_US
-skip-external-locking
+#datadir = /var/lib/mysql
+#tmpdir = /tmp
# Broken reverse DNS slows down connections considerably and name resolve is
# safe to skip if there are no "host by domain name" access grants