diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-27 09:21:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-27 09:21:19 +0200 |
| commit | 77ce4ead811b606540b9a2cf6d9ce3146a91ab0f (patch) | |
| tree | 5dcd215abf7afd125ad5744697565121b954c1b2 /support-files | |
| parent | 677c44f0c37973ad70550d9b807781e688764fae (diff) | |
| parent | d61e5260fb9983ea8dff539b23a6d0a150c2065c (diff) | |
| download | mariadb-git-77ce4ead811b606540b9a2cf6d9ce3146a91ab0f.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 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 |