diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-08-21 16:34:31 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-08-21 16:34:31 +0300 |
| commit | 4222b2520bdea2be41b50b888f930a63f5af8991 (patch) | |
| tree | 02fcc81139a9a099f0d07c25d03e8b3f40f4c6b6 /debian | |
| parent | 551ad1cf6f80ad1fab35746eee304d733baa9adf (diff) | |
| parent | c7973615e723b13c6457b494b72be2fac35bfd18 (diff) | |
| download | mariadb-git-4222b2520bdea2be41b50b888f930a63f5af8991.tar.gz | |
Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/mariadb-galera-server-5.5.mysql.init | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/mariadb-galera-server-5.5.mysql.init b/debian/mariadb-galera-server-5.5.mysql.init index 01e1288525e..07edda2f079 100644 --- a/debian/mariadb-galera-server-5.5.mysql.init +++ b/debian/mariadb-galera-server-5.5.mysql.init @@ -106,7 +106,7 @@ case "${1:-''}" in test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld # Start MariaDB! - /usr/bin/mysqld_safe > /dev/null 2>&1 & + /usr/bin/mysqld_safe "${@:2}" > /dev/null 2>&1 & # 6s was reported in #352070 to be too few when using ndbcluster for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do @@ -142,7 +142,7 @@ case "${1:-''}" in log_daemon_msg "Killing MariaDB database server by signal" "mysqld" killall -15 mysqld server_down= - for i in 1 2 3 4 5 6 7 8 9 10 1 2 3 4 5 6 7 8 9 10 1 2 3 4 5 6 7 8 9 10; do + for i in `seq 1 600`; do sleep 1 if mysqld_status check_dead nowarn; then server_down=1; break; fi done |