diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-09-02 14:36:14 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-09-02 14:36:14 +0200 |
| commit | 5edf3e03887142f83044ee9fcc8fcf65386c43c7 (patch) | |
| tree | 179e1f56be501aeb8ed2a975ee49efad5e5144dd /support-files | |
| parent | 32a29afea777d8bbfcea7a2b5e6e5ee674013cb5 (diff) | |
| parent | c58e184b14ccdf0b0eaeeeb7947e23b8b5fff7a7 (diff) | |
| download | mariadb-git-5edf3e03887142f83044ee9fcc8fcf65386c43c7.tar.gz | |
Merge branch '10.5' into 10.6
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mariadb@.service.in | 2 | ||||
| -rw-r--r-- | support-files/policy/apparmor/usr.sbin.mysqld | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in index 79f347ec271..14749092103 100644 --- a/support-files/mariadb@.service.in +++ b/support-files/mariadb@.service.in @@ -100,7 +100,7 @@ # in configuration between instances. # # [Service] -# Environment=MYSQLD_MULTI_INSTANCE="--socket=/var/run/mysqld/%I.sock \ +# Environment=MYSQLD_MULTI_INSTANCE="--socket=/run/mysqld/%I.sock \ # --datadir=/var/lib/mysqld-multi/%I \ # --skip-networking" # diff --git a/support-files/policy/apparmor/usr.sbin.mysqld b/support-files/policy/apparmor/usr.sbin.mysqld index 18a9c357ff2..c60ecd28531 100644 --- a/support-files/policy/apparmor/usr.sbin.mysqld +++ b/support-files/policy/apparmor/usr.sbin.mysqld @@ -54,8 +54,8 @@ /var/log/mysql.log rw, /var/log/mysql/ r, /var/log/mysql/* rw, - /var/run/mysqld/mysqld.pid w, - /var/run/mysqld/mysqld.sock w, + /run/mysqld/mysqld.pid w, + /run/mysqld/mysqld.sock w, profile /bin/dash flags=(complain) { |