Merge tag 'mariadb-10.0.28' into 10.0-galera

This commit is contained in:
Nirbhay Choubey 2016-10-28 15:50:13 -04:00
commit 5db2195a35
307 changed files with 10671 additions and 5195 deletions

View file

@ -319,7 +319,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 2>&1 &
$bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "$@" &
wait_for_ready; return_value=$?
# Make lock for RedHat / SuSE