diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2016-09-28 16:19:58 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2016-09-28 16:19:58 +0300 |
| commit | 23af6f5942e7235a7c14a36cb8dd0d2796b5ef37 (patch) | |
| tree | 96dad57dc1b9946a3cbec98473b3ec2534a455f2 /support-files | |
| parent | a53f3c6d3cfa50b15b1aff26bc9479eb582d8611 (diff) | |
| parent | 078e510e0a75510cd2af8aebe2f300987d10e4d2 (diff) | |
| download | mariadb-git-23af6f5942e7235a7c14a36cb8dd0d2796b5ef37.tar.gz | |
Merge branch '10.0' of github.com:MariaDB/server 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 cd1e7754197..cab237848c7 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 2>&1 & + $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "$@" >/dev/null & wait_for_ready; return_value=$? # Make lock for RedHat / SuSE |