diff options
author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-10-28 15:50:13 -0400 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-10-28 15:50:13 -0400 |
commit | 5db2195a35c0a2ee7703ab603721b2f0987d2585 (patch) | |
tree | 1306ce565f0f01f56dd31b2c43b1233bcb08257c /support-files | |
parent | c9ded859a6fad25fc513d3a0c7d17f826e567691 (diff) | |
parent | eca8c324e9a02f530853580991b11b587f54b24a (diff) | |
download | mariadb-git-5db2195a35c0a2ee7703ab603721b2f0987d2585.tar.gz |
Merge tag 'mariadb-10.0.28' into 10.0-galera
Diffstat (limited to 'support-files')
-rw-r--r-- | support-files/mysql.server.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index b562354a586..8d2e78edbd8 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -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 |