diff --git a/5.5/docker-entrypoint.sh b/5.5/docker-entrypoint.sh
index e85315f60..ffdc2377d 100755
--- a/5.5/docker-entrypoint.sh
+++ b/5.5/docker-entrypoint.sh
@@ -97,7 +97,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 
 		mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
 
-		for i in {30..0}; do
+		for i in $(seq ${MYSQL_START_TIMEOUT:-30} -1 0); do
 			if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
 				break
 			fi
@@ -105,7 +105,8 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 			sleep 1
 		done
 		if [ "$i" = 0 ]; then
-			echo >&2 'MySQL init process failed.'
+			echo >&2 'MySQL init process failed. Cleaning up..'
+			rm -rf $DATADIR/mysql
 			exit 1
 		fi
 
diff --git a/5.6/docker-entrypoint.sh b/5.6/docker-entrypoint.sh
index 912875dca..2c0bebaef 100755
--- a/5.6/docker-entrypoint.sh
+++ b/5.6/docker-entrypoint.sh
@@ -97,15 +97,16 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 
 		mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
 
-		for i in {30..0}; do
+		for i in $(seq ${MYSQL_START_TIMEOUT:-30} -1 0); do
 			if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
 				break
 			fi
-			echo 'MySQL init process in progress...'
+			echo "MySQL init process in progress..."
 			sleep 1
 		done
 		if [ "$i" = 0 ]; then
-			echo >&2 'MySQL init process failed.'
+			echo >&2 'MySQL init process failed. Cleaning up..'
+			rm -rf $DATADIR/mysql
 			exit 1
 		fi
 
diff --git a/5.7/docker-entrypoint.sh b/5.7/docker-entrypoint.sh
index a6ab80c5f..2ece97a80 100755
--- a/5.7/docker-entrypoint.sh
+++ b/5.7/docker-entrypoint.sh
@@ -104,7 +104,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 
 		mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
 
-		for i in {30..0}; do
+		for i in $(seq ${MYSQL_START_TIMEOUT:-30} -1 0); do
 			if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
 				break
 			fi
@@ -112,7 +112,8 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 			sleep 1
 		done
 		if [ "$i" = 0 ]; then
-			echo >&2 'MySQL init process failed.'
+			echo >&2 'MySQL init process failed. Cleaning up..'
+			rm -rf $DATADIR/mysql
 			exit 1
 		fi
 
diff --git a/8.0/docker-entrypoint.sh b/8.0/docker-entrypoint.sh
index a6ab80c5f..2ece97a80 100755
--- a/8.0/docker-entrypoint.sh
+++ b/8.0/docker-entrypoint.sh
@@ -104,7 +104,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 
 		mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
 
-		for i in {30..0}; do
+		for i in $(seq ${MYSQL_START_TIMEOUT:-30} -1 0); do
 			if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
 				break
 			fi
@@ -112,7 +112,8 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 			sleep 1
 		done
 		if [ "$i" = 0 ]; then
-			echo >&2 'MySQL init process failed.'
+			echo >&2 'MySQL init process failed. Cleaning up..'
+			rm -rf $DATADIR/mysql
 			exit 1
 		fi