diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-09-19 12:12:33 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-09-19 12:12:33 -0400 |
| commit | 81c13acfb3585baf435eb37955561053f02e12bb (patch) | |
| tree | 74d838b5d1011187705f4801db033118fd41537c /support-files | |
| parent | d40d3f4e57f375897aa29e72e947e372e6bc229d (diff) | |
| parent | 0da39caceea7733a94d898427d63ba2670160af4 (diff) | |
| download | mariadb-git-81c13acfb3585baf435eb37955561053f02e12bb.tar.gz | |
Merge tag 'mariadb-5.5.52' into 5.5-galeramariadb-galera-5.5.52
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 d1c73d3db7d..9fb511c2f55 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -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 |