diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-29 12:59:51 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-29 12:59:51 +0200 |
| commit | 2ede40e67e41f294a32ba3e4797bc6fc4c070217 (patch) | |
| tree | ebc7c92dfe7b4f007abd0b331b407ccc61b19578 /support-files/mysql.server.sh | |
| parent | ad2076945062f7f6d29752641048071229435391 (diff) | |
| parent | a3f11f75499ffc867aefe24c80a9c57fbdfb8ac2 (diff) | |
| download | mariadb-git-2ede40e67e41f294a32ba3e4797bc6fc4c070217.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'support-files/mysql.server.sh')
| -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 54f9ff55e3b..145daff6962 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -308,7 +308,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 |