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

Merge branch '5.5' into 10.1

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-07-25 13:27:11 +02:00
parent 8d0dabc56b 2536c0b1eb
commit ae476868a5
63 changed files with 3192 additions and 114 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`