Merge branch '10.0' into 10.1

This commit is contained in:
Sergei Golubchik 2016-09-29 12:59:51 +02:00
commit 2ede40e67e
6 changed files with 73 additions and 12 deletions

View file

@ -308,7 +308,7 @@ case "$mode" in
then
# Give extra arguments to mysqld with the my.cnf file. This script
# may be overwritten at next upgrade.
$bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "$@" >/dev/null &
$bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "$@" &
wait_for_ready; return_value=$?
# Make lock for RedHat / SuSE