diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-29 12:31:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-29 12:31:46 +0200 |
| commit | a3f11f75499ffc867aefe24c80a9c57fbdfb8ac2 (patch) | |
| tree | 3b031b05ba80e851983342aff066c1d1315a3cdb /support-files | |
| parent | 23af6f5942e7235a7c14a36cb8dd0d2796b5ef37 (diff) | |
| parent | 7497ebf8a49bfe30bb4110f2ac20a30f804b7946 (diff) | |
| download | mariadb-git-a3f11f75499ffc867aefe24c80a9c57fbdfb8ac2.tar.gz | |
Merge branch '5.5' into 10.0
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 cab237848c7..5e1ad5bfd99 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -303,7 +303,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 & + $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "$@" & wait_for_ready; return_value=$? # Make lock for RedHat / SuSE |