Index: files/mysql-server.in
===================================================================
--- files/mysql-server.in       (revision 544887)
+++ files/mysql-server.in       (working copy)
@@ -120,14 +120,14 @@
                        return 1
                fi
        done
+       [ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`"
+       if [ ! -d "${mysql_rundir}" ]; then
+               local mysql_group="`/usr/bin/id -gn ${mysql_user}`" || return 1
+               install -d -o ${mysql_user} -g ${mysql_group} "${mysql_rundir}" || return 1
+       fi
        if [ ! -d "${mysql_dbdir}/mysql/." ]; then
                mysql_create_auth_tables || return 1
        fi
-       [ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`"
-       if [ ! -d "${mysql_rundir}" ]; then
-               install -d -o ${mysql_user} -g %%MARIADB_GROUP%% "${mysql_rundir}"
-
-       fi
 %%LEGACY_LIMITS%%      if checkyesno mysql_limits; then
 %%LEGACY_LIMITS%%              eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
 %%LEGACY_LIMITS%%      else