database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge branch '5.5' into 10.0

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-01-28 10:36:12 +01:00
parent e6fcd72309 ad220b96fb
commit a3df9bcadc
18 changed files with 219 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
support-files/mysql.server.sh
View File

@@ -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
}
#