diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-07 13:59:31 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-07 13:59:31 +0100 |
| commit | 65c5ef9b495bac078ad2a502a75801c7cfe5b95a (patch) | |
| tree | 266859fc4e22dcd18112a25e8a3e4f9d93a043a0 /support-files | |
| parent | 7293ce0ee81f05b1ec3ac9ddcc88bfbee4030e55 (diff) | |
| parent | 625994b7cc4ebd0bc2652ae80b93386aa4b766ac (diff) | |
| download | mariadb-git-65c5ef9b495bac078ad2a502a75801c7cfe5b95a.tar.gz | |
dirty merge
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.server.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index e2054a8fb98..09f26d52129 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -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 } # |