summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-09-20 17:47:49 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-09-20 17:47:49 +0300
commitfc3b1a7d2fcc45c05aa19ea35e1d7978b4f90670 (patch)
treed3f4f28b6bb2ffa6e6c4b19e6c03f2e209590171 /support-files
parent4cfef2a5a4157269244923637032c21ff67b0161 (diff)
parent96f06f952d087bd47225cc2784edbb0510fad818 (diff)
downloadmariadb-git-fc3b1a7d2fcc45c05aa19ea35e1d7978b4f90670.tar.gz
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'support-files')
-rw-r--r--support-files/policy/apparmor/usr.sbin.mysqld2
1 files changed, 2 insertions, 0 deletions
diff --git a/support-files/policy/apparmor/usr.sbin.mysqld b/support-files/policy/apparmor/usr.sbin.mysqld
index 307872c0fff..05ec77414d2 100644
--- a/support-files/policy/apparmor/usr.sbin.mysqld
+++ b/support-files/policy/apparmor/usr.sbin.mysqld
@@ -34,6 +34,8 @@
/etc/mysql/*.pem r,
/etc/mysql/conf.d/ r,
/etc/mysql/conf.d/* r,
+ /etc/mysql/mariadb.conf.d/ r,
+ /etc/mysql/mariadb.conf.d/* r,
/etc/nsswitch.conf r,
/etc/passwd r,
/etc/services r,