diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-30 12:45:38 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-30 12:45:38 -0500 |
| commit | 4a6be51f78e79b1ee5bc0442b7af8b3108a64512 (patch) | |
| tree | c9a15dc1470ff64aa82fe3afdb23503d044e4299 /support-files/mysql.server.sh | |
| parent | 5b6a4f25a566f967e8b1010998a22256bd045511 (diff) | |
| download | mariadb-git-4a6be51f78e79b1ee5bc0442b7af8b3108a64512.tar.gz | |
* Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.
* Fixed Debian/Ubuntu dist files.
* Fixed some compiler warnings.
Diffstat (limited to 'support-files/mysql.server.sh')
| -rw-r--r-- | support-files/mysql.server.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 2b4577377e8..317825b0350 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -52,6 +52,7 @@ datadir= # 0 means don't wait at all # Negative numbers mean to wait indefinitely service_startup_timeout=900 +startup_sleep=1 # Lock directory for RedHat / SuSE. lockdir='/var/lock/subsys' @@ -157,6 +158,7 @@ wait_for_pid () { pid="$2" # process ID of the program operating on the pid-file pid_file_path="$3" # path to the PID file. + sst_progress_file=$datadir/sst_in_progress i=0 avoid_race_condition="by checking again" @@ -194,9 +196,14 @@ wait_for_pid () { fi fi + if test -e $sst_progress_file && [ $startup_sleep -ne 10 ];then + echo $echo_n "SST in progress, setting sleep higher" + startup_sleep=10 + fi + echo $echo_n ".$echo_c" i=`expr $i + 1` - sleep 1 + sleep $startup_sleep done |