diff options
author | Alexander Barkov <bar@mariadb.org> | 2016-12-30 15:43:08 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.org> | 2016-12-30 15:43:08 +0400 |
commit | 86209c7304fe022e5e3c7b535176cc79661af86b (patch) | |
tree | 3d9c3b8a54524a66a38c2b82d27c22ff6be22cfa /support-files/mysql.server.sh | |
parent | c0fc4391f0f591248865abe0e20842658d878bff (diff) | |
parent | 9b2bcf19f40ef0f69b6f5da7fd5c348e50b38f2c (diff) | |
download | mariadb-git-86209c7304fe022e5e3c7b535176cc79661af86b.tar.gz |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
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 d09cefef50d..c934f7a47a5 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 2>&1 & + $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "$@" & wait_for_ready; return_value=$? # Make lock for RedHat / SuSE |