From 95368e8fd066b35ec690a2d683b14b0b243b1652 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Wed, 10 Sep 2014 17:37:27 -0700
Subject: [PATCH] Cherry-pick r2506 from master.

---
 profiles/apparmor.d/abstractions/mysql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/profiles/apparmor.d/abstractions/mysql b/profiles/apparmor.d/abstractions/mysql
index 96c913fcb..fed759bb0 100644
--- a/profiles/apparmor.d/abstractions/mysql
+++ b/profiles/apparmor.d/abstractions/mysql
@@ -9,7 +9,7 @@
 #
 # ------------------------------------------------------------------
 
-   /var/lib/mysql/mysql.sock rw,
-   /{var/,}run/mysql/mysql.sock rw,
+   /var/lib/mysql{,d}/mysql{,d}.sock rw,
+   /{var/,}run/mysql{,d}/mysql{,d}.sock rw,
    /usr/share/{mysql,mysql-community-server,mariadb}/charsets/ r,
    /usr/share/{mysql,mysql-community-server,mariadb}/charsets/*.xml r,