1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge tag 'mariadb-5.5.52' into 5.5-galera

This commit is contained in:
Nirbhay Choubey
2016-09-19 12:12:33 -04:00
31 changed files with 274 additions and 322 deletions

View File

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