diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-11 20:51:09 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-11 20:51:09 +0200 |
| commit | 7ae555c1148f190f91d00499c2541fe7c2d4f555 (patch) | |
| tree | 861c0054243efee45b7a4b72135f897afc8972ba /support-files | |
| parent | b9631e310b7cadf8711eef643e432d7e816680b4 (diff) | |
| parent | 754e7eff2872995e2b6e62f9da7448587a411c7b (diff) | |
| download | mariadb-git-7ae555c1148f190f91d00499c2541fe7c2d4f555.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
80% reverted
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 63cef2ade96..e5c8814f930 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" $other_args >/dev/null 2>&1 & + $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" $other_args >/dev/null & wait_for_ready; return_value=$? # Make lock for RedHat / SuSE |