diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-10-14 10:57:07 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-10-14 10:57:07 -0400 |
| commit | 308c666b604c7a5018b3b70203bf897c2354d449 (patch) | |
| tree | 52f4bf4532acfcd20a3264361e788fc44d08d0b5 /support-files | |
| parent | 04f92dde67a3d4f6fcbdbf65fdb63a54ff6761d8 (diff) | |
| parent | eac8d95ffcdea7cd31d60d273e30cb3dfec66add (diff) | |
| download | mariadb-git-308c666b604c7a5018b3b70203bf897c2354d449.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.5-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 9fb511c2f55..c00c06f28af 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 & + $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" $other_args & wait_for_ready; return_value=$? # Make lock for RedHat / SuSE |