diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-28 10:36:12 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-28 10:36:12 +0100 |
| commit | a3df9bcadc57be70bdadc8cf21290e4fe6c9b37a (patch) | |
| tree | 630daf21227a6fcd6466f65d70f5809928e2c8b2 /support-files/mysql.server.sh | |
| parent | e6fcd7230954c6111bba63e7f7201fc81e50178e (diff) | |
| parent | ad220b96fb01dbb6acf7e51bdd8d4d6362d96ea7 (diff) | |
| download | mariadb-git-a3df9bcadc57be70bdadc8cf21290e4fe6c9b37a.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'support-files/mysql.server.sh')
| -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 958902620a5..3817b1f6203 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -181,7 +181,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 } # |