mirror of
https://github.com/MariaDB/server.git
synced 2026-04-30 12:15:32 +02:00
Added option --skip-kill-mysqld to mysqld_safe. This can be useful,
if one is running many mysqlds through mysqld_multi, for example. Without this option, on Linux one mysqld_safe process may kill other mysqlds as well, if started using the same binary and path.
This commit is contained in:
parent
f5fba55325
commit
9adfaf1b2f
1 changed files with 7 additions and 1 deletions
|
|
@ -10,6 +10,8 @@
|
|||
# mysql.server works by first doing a cd to the base directory and from there
|
||||
# executing mysqld_safe
|
||||
|
||||
KILL_MYSQLD=1;
|
||||
|
||||
trap '' 1 2 3 15 # we shouldn't let anyone kill us
|
||||
|
||||
umask 007
|
||||
|
|
@ -34,6 +36,9 @@ parse_arguments() {
|
|||
|
||||
for arg do
|
||||
case "$arg" in
|
||||
--skip-kill-mysqld*)
|
||||
KILL_MYSQLD=0;
|
||||
;;
|
||||
# these get passed explicitly to mysqld
|
||||
--basedir=*) MY_BASEDIR_VERSION=`echo "$arg" | sed -e "s;--basedir=;;"` ;;
|
||||
--datadir=*) DATADIR=`echo "$arg" | sed -e "s;--datadir=;;"` ;;
|
||||
|
|
@ -83,6 +88,7 @@ parse_arguments() {
|
|||
done
|
||||
}
|
||||
|
||||
|
||||
MY_PWD=`pwd`
|
||||
# Check if we are starting this relative (for the binary release)
|
||||
if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
|
||||
|
|
@ -298,7 +304,7 @@ do
|
|||
break
|
||||
fi
|
||||
|
||||
if @IS_LINUX@
|
||||
if test @IS_LINUX@ -a $KILL_MYSQLD -eq 1
|
||||
then
|
||||
# Test if one process was hanging.
|
||||
# This is only a fix for Linux (running as base 3 mysqld processes)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue