5.5 merge

debian/mariadb-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