mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 10:14:19 +01:00
Fix to ignore mysqld_safe.pid
This commit is contained in:
parent
52a3029df9
commit
01c83f0926
1 changed files with 2 additions and 2 deletions
|
@ -643,7 +643,7 @@ then
|
|||
fi
|
||||
if [ -z "$PID_FILE_PATT" ]
|
||||
then
|
||||
PID_FILE_PATT=`ls $mysql_datadir/*.pid 2>/dev/null | grep -v "mysqld_safe.pid"`
|
||||
PID_FILE_PATT="$mysql_datadir/*.pid"
|
||||
fi
|
||||
|
||||
# Check if we can safely upgrade. An upgrade is only safe if it's from one
|
||||
|
@ -716,7 +716,7 @@ fi
|
|||
|
||||
# We assume that if there is exactly one ".pid" file,
|
||||
# it contains the valid PID of a running MySQL server.
|
||||
NR_PID_FILES=`ls $PID_FILE_PATT 2>/dev/null | wc -l`
|
||||
NR_PID_FILES=`ls $PID_FILE_PATT 2>/dev/null | grep -v "mysqld_safe.pid" | wc -l`
|
||||
case $NR_PID_FILES in
|
||||
0 ) SERVER_TO_START='' ;; # No "*.pid" file == no running server
|
||||
1 ) SERVER_TO_START='true' ;;
|
||||
|
|
Loading…
Add table
Reference in a new issue