diff --git a/5.5/docker-entrypoint.sh b/5.5/docker-entrypoint.sh
index fd5ccc2be..23eac9456 100755
--- a/5.5/docker-entrypoint.sh
+++ b/5.5/docker-entrypoint.sh
@@ -200,6 +200,11 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 			exit 1
 		fi
 
+		if [ "$MYSQL_INIT_ONLY" ]; then
+			echo 'MySQL init process done. Exiting.'
+			exit 0
+		fi
+
 		echo
 		echo 'MySQL init process done. Ready for start up.'
 		echo
diff --git a/5.6/docker-entrypoint.sh b/5.6/docker-entrypoint.sh
index 134a4e12d..195a0734c 100755
--- a/5.6/docker-entrypoint.sh
+++ b/5.6/docker-entrypoint.sh
@@ -200,6 +200,11 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 			exit 1
 		fi
 
+		if [ "$MYSQL_INIT_ONLY" ]; then
+			echo 'MySQL init process done. Exiting.'
+			exit 0
+		fi
+
 		echo
 		echo 'MySQL init process done. Ready for start up.'
 		echo
diff --git a/5.7/docker-entrypoint.sh b/5.7/docker-entrypoint.sh
index 112d88c22..a835c57fb 100755
--- a/5.7/docker-entrypoint.sh
+++ b/5.7/docker-entrypoint.sh
@@ -205,6 +205,11 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 			exit 1
 		fi
 
+		if [ "$MYSQL_INIT_ONLY" ]; then
+			echo 'MySQL init process done. Exiting.'
+			exit 0
+		fi
+
 		echo
 		echo 'MySQL init process done. Ready for start up.'
 		echo
diff --git a/8.0/docker-entrypoint.sh b/8.0/docker-entrypoint.sh
index 5ed7cd25c..9de772d02 100755
--- a/8.0/docker-entrypoint.sh
+++ b/8.0/docker-entrypoint.sh
@@ -207,6 +207,11 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 			exit 1
 		fi
 
+		if [ "$MYSQL_INIT_ONLY" ]; then
+			echo 'MySQL init process done. Exiting.'
+			exit 0
+		fi
+
 		echo
 		echo 'MySQL init process done. Ready for start up.'
 		echo