mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-03 13:45:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.1' into 10.2

Browse source
This commit is contained in:
Oleksandr Byelkin 2019-07-26 07:03:39 +02:00
commit cf8c2a3c3b
65 changed files with 3227 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

2
support-files/mysql.server.sh
View file

@ -388,7 +388,7 @@ case "$mode" in
fi
else
# Try to find appropriate mysqld process
mysqld_pid=`pgrep $libexecdir/mysqld`
mysqld_pid=`pgrep -f $libexecdir/mysqld`
# test if multiple pids exist
pid_count=`echo $mysqld_pid | wc -w`