diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-09-25 23:00:45 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-01 23:38:27 +0200 |
| commit | 3620910eeac8f118c9a6cb8a1c0ec23e56fb5d98 (patch) | |
| tree | d08462d84d10324bd05836c968288d8ab1739e11 /support-files | |
| parent | b04f848176b0d8af41eb3627ba1b6ed4dd3327e3 (diff) | |
| download | mariadb-git-3620910eeac8f118c9a6cb8a1c0ec23e56fb5d98.tar.gz | |
cleanup: galera merge, simple changes
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.server.sh | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index bdc481d39c2..caeec3f610f 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -52,7 +52,6 @@ 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' @@ -254,8 +253,6 @@ wait_for_gone () { wait_for_ready () { - sst_progress_file=$datadir/sst_in_progress - i=0 while test $i -ne $service_startup_timeout ; do @@ -264,14 +261,9 @@ wait_for_ready () { return 0 fi - if test -e $sst_progress_file && [ $startup_sleep -ne 10 ];then - echo $echo_n "SST in progress, setting sleep intervals to 10 seconds" - startup_sleep=10 - fi - echo $echo_n ".$echo_c" i=`expr $i + 1` - sleep $startup_sleep + sleep 1 done |