dirty merge

This commit is contained in:
Oleksandr Byelkin 2019-02-07 13:59:31 +01:00
commit 65c5ef9b49
185 changed files with 5958 additions and 1871 deletions

View file

@ -185,7 +185,11 @@ fi
user='@MYSQLD_USER@'
su_kill() {
su - $user -s /bin/sh -c "kill $*" >/dev/null 2>&1
if test "$USER" = "$user"; then
kill $* >/dev/null 2>&1
else
su - $user -s /bin/sh -c "kill $*" >/dev/null 2>&1
fi
}
#