Set new debian runtime dir

cmake/install_layout.cmake

@@ -199,7 +199,7 @@ SET(INSTALL_SUPPORTFILESDIR_DEB         "share/mariadb")
 #
 SET(INSTALL_MYSQLDATADIR_DEB            "/var/lib/mysql")
 
-SET(INSTALL_RUNDATADIR_DEB              "/run/mysqld")
+SET(INSTALL_RUNDATADIR_DEB              "/run/mariadbd")
 SET(INSTALL_UNIX_ADDRDIR_DEB            "${INSTALL_RUNDATADIR_DEB}/mysqld.sock")
 SET(INSTALL_SYSTEMD_UNITDIR_DEB         "/usr/lib/systemd/system")
 SET(INSTALL_SYSTEMD_SYSUSERSDIR_DEB     "/usr/lib/sysusers.d")

debian/additions/mariadb.cnf

@@ -22,7 +22,7 @@
 [client-server]
 # Port or socket location where to connect
 # port = 3306
-socket = /run/mysqld/mysqld.sock
+socket = /run/mariadbd/mysqld.sock
 
 # Import all .cnf files from configuration directory
 !includedir /etc/mysql/conf.d/

debian/additions/mariadb.conf.d/50-server.cnf

@@ -13,7 +13,7 @@
 #
 
 #user                    = mysql
-pid-file                = /run/mysqld/mysqld.pid
+pid-file                = /run/mariadbd/mysqld.pid
 basedir                 = /usr
 #datadir                 = /var/lib/mysql
 #tmpdir                  = /tmp

debian/mariadb-server.logcheck.ignore.paranoid

@@ -1,8 +1,8 @@
-/etc/init.d/mariadb\[[0-9]+\]: Check that mariadbd is running and that the socket: '/run/mysqld/mysqld.sock' exists\!$
+/etc/init.d/mariadb\[[0-9]+\]: Check that mariadbd is running and that the socket: '/run/(mariadbd|mysqld)/mysqld.sock' exists\!$
 /etc/init.d/mariadb\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
 /etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
 mariadbd\[[0-9]+\]: $
-mariadbd\[[0-9]+\]: Version: .* socket: '/run/mysqld/mysqld.sock'  port: 3306$
+mariadbd\[[0-9]+\]: Version: .* socket: '/run/(mariadbd|mysqld)/mysqld.sock'  port: 3306$
 mariadbd\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$
 mysqld_safe\[[0-9]+\]: started$
 usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$

debian/mariadb-server.logcheck.ignore.server

@@ -1,5 +1,5 @@
 /etc/init.d/mariadb\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
-/etc/init.d/mariadb\[[0-9]+\]: Check that mariadbd is running and that the socket: '/run/mysqld/mysqld.sock' exists\!$
+/etc/init.d/mariadb\[[0-9]+\]: Check that mariadbd is running and that the socket: '/run/(mariadbd|mysqld)/mysqld.sock' exists\!$
 /etc/init.d/mariadb\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
 /etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
 mariadbd\[[0-9]+\]: ?$

debian/mariadb-server.logcheck.ignore.workstation

@@ -1,5 +1,5 @@
 /etc/init.d/mariadb\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
-/etc/init.d/mariadb\[[0-9]+\]: Check that mariadbd is running and that the socket: '/run/mysqld/mysqld.sock' exists\!$
+/etc/init.d/mariadb\[[0-9]+\]: Check that mariadbd is running and that the socket: '/run/(mariadbd|mysqld)/mysqld.sock' exists\!$
 /etc/init.d/mariadb\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
 /etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
 mariadbd\[[0-9]+\]: ?$

debian/mariadb-server.mariadb.init

@@ -171,7 +171,7 @@ case "${1:-''}" in
    log_end_msg 0
   else
     # Could be removed during boot
-    test -e /run/mysqld || install -m 755 -o mysql -g root -d /run/mysqld
+    test -e /run/mariadbd || install -m 755 -o mysql -g root -d /rrun/mariadbd
 
     # Start MariaDB!
     /usr/bin/mariadbd-safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER &

debian/mariadb-server.postrm

@@ -48,7 +48,7 @@ then
       # /var/lib/mysql is a mount point
       rmdir --ignore-fail-on-non-empty /var/lib/mysql || true
     fi
-    rm -rf /run/mysqld # this directory is created by the init script, don't leave behind
+    rm -rf /run/mariadbd # this directory is created by the init script, don't leave behind
     userdel mysql || true
   fi
 

support-files/mariadb@.service.in

@@ -100,7 +100,7 @@
 # in configuration between instances.
 #
 #   [Service]
-#   Environment=MYSQLD_MULTI_INSTANCE="--socket=/run/mysqld/%I.sock \
+#   Environment=MYSQLD_MULTI_INSTANCE="--socket=/run/mariadbd/%I.sock \
 #                        --datadir=/var/lib/mysqld-multi/%I \
 #                        --skip-networking"
 #

support-files/policy/apparmor/usr.sbin.mysqld

@@ -40,6 +40,8 @@
   /etc/nsswitch.conf r,
   /etc/passwd r,
   /etc/services r,
+  /run/mariadbd/mysqld.pid w,
+  /run/mariadbd/mysqld.sock w,
   /run/mysqld/mysqld.pid w,
   /run/mysqld/mysqld.sock w,
   /sys/devices/system/cpu/ r,
@@ -55,6 +57,8 @@
   /var/log/mysql.log rw,
   /var/log/mysql/ r,
   /var/log/mysql/* rw,
+  /run/mariadbd/mysqld.pid w,
+  /run/mariadbd/mysqld.sock w,
   /run/mysqld/mysqld.pid w,
   /run/mysqld/mysqld.sock w,
 
@@ -131,6 +135,7 @@
     /proc/*/net/* r,
     /proc/locks r,
     /proc/sys/net/ipv4/ip_local_port_range r,
+    /run/mariadbd/mysqld.sock rw,
     /run/mysqld/mysqld.sock rw,
     /sbin/ip rix,
     /usr/bin/basename rix,