mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
- applied patch for mysqld_safe from Christian Hammers to be able to
define a different niceness level in my.cnf (Bug #627)
This commit is contained in:
parent
e38221a4e7
commit
63df5f7cb7
1 changed files with 12 additions and 3 deletions
|
@ -70,6 +70,7 @@ parse_arguments() {
|
||||||
MYSQLD="mysqld"
|
MYSQLD="mysqld"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
--nice=*) niceness=`echo "$arg" | sed -e "s;--nice=;;"` ;;
|
||||||
*)
|
*)
|
||||||
if test -n "$pick_args"
|
if test -n "$pick_args"
|
||||||
then
|
then
|
||||||
|
@ -110,6 +111,7 @@ fi
|
||||||
MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
|
MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
|
||||||
MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
|
MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
|
||||||
user=@MYSQLD_USER@
|
user=@MYSQLD_USER@
|
||||||
|
niceness=0
|
||||||
|
|
||||||
# Use the mysqld-max binary by default if the user doesn't specify a binary
|
# Use the mysqld-max binary by default if the user doesn't specify a binary
|
||||||
if test -x $ledir/mysqld-max
|
if test -x $ledir/mysqld-max
|
||||||
|
@ -167,7 +169,12 @@ export MYSQL_UNIX_PORT
|
||||||
export MYSQL_TCP_PORT
|
export MYSQL_TCP_PORT
|
||||||
|
|
||||||
|
|
||||||
NOHUP_NICENESS="nohup"
|
if test $niceness -eq 0
|
||||||
|
then
|
||||||
|
NOHUP_NICENESS="nohup"
|
||||||
|
else
|
||||||
|
NOHUP_NICENESS="nohup nice -$niceness"
|
||||||
|
fi
|
||||||
|
|
||||||
# Using nice with no args to get the niceness level is GNU-specific.
|
# Using nice with no args to get the niceness level is GNU-specific.
|
||||||
# This check could be extended for other operating systems (e.g.,
|
# This check could be extended for other operating systems (e.g.,
|
||||||
|
@ -198,8 +205,10 @@ then
|
||||||
nice --$nice_value_diff echo testing > /dev/null 2>&1
|
nice --$nice_value_diff echo testing > /dev/null 2>&1
|
||||||
then
|
then
|
||||||
# nohup increases the priority (bad), and we are permitted
|
# nohup increases the priority (bad), and we are permitted
|
||||||
# to lower the priority
|
# to lower the priority with respect to the value the user
|
||||||
NOHUP_NICENESS="nice --$nice_value_diff nohup"
|
# might have been given
|
||||||
|
niceness=`expr $niceness - $nice_value_diff`
|
||||||
|
NOHUP_NICENESS="nice -$niceness nohup"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue