From c0126d401f93c1a2c641ad931e8002318b904dce Mon Sep 17 00:00:00 2001
From: Aario Shahbanhy <aario.shahbanhy@sitewards.com>
Date: Wed, 28 Feb 2018 11:17:03 +0100
Subject: [PATCH] More comprehensive logs during mysql initialization and also
 visible error messages

---
 5.5/docker-entrypoint.sh | 5 +++--
 5.6/docker-entrypoint.sh | 5 +++--
 5.7/docker-entrypoint.sh | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/5.5/docker-entrypoint.sh b/5.5/docker-entrypoint.sh
index 122ff2ddd..362cb3faf 100755
--- a/5.5/docker-entrypoint.sh
+++ b/5.5/docker-entrypoint.sh
@@ -99,10 +99,11 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 		mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
 
 		for i in {30..0}; do
-			if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
+			echo 'Trying to connect to mysql...'
+			if echo 'SELECT 1' | "${mysql[@]}" > /dev/null; then
 				break
 			fi
-			echo 'MySQL init process in progress...'
+			echo 'MySQL init process must be in progress...'
 			sleep 1
 		done
 		if [ "$i" = 0 ]; then
diff --git a/5.6/docker-entrypoint.sh b/5.6/docker-entrypoint.sh
index e654ea63e..078acca2f 100755
--- a/5.6/docker-entrypoint.sh
+++ b/5.6/docker-entrypoint.sh
@@ -99,10 +99,11 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 		mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
 
 		for i in {30..0}; do
-			if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
+			echo 'Trying to connect to mysql...'
+			if echo 'SELECT 1' | "${mysql[@]}" > /dev/null; then
 				break
 			fi
-			echo 'MySQL init process in progress...'
+			echo 'MySQL init process must be in progress...'
 			sleep 1
 		done
 		if [ "$i" = 0 ]; then
diff --git a/5.7/docker-entrypoint.sh b/5.7/docker-entrypoint.sh
index 9bd8fd64f..8fc2ddc4a 100755
--- a/5.7/docker-entrypoint.sh
+++ b/5.7/docker-entrypoint.sh
@@ -105,10 +105,11 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 		mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
 
 		for i in {30..0}; do
-			if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
+			echo 'Trying to connect to mysql...'
+			if echo 'SELECT 1' | "${mysql[@]}" > /dev/null; then
 				break
 			fi
-			echo 'MySQL init process in progress...'
+			echo 'MySQL init process must be in progress...'
 			sleep 1
 		done
 		if [ "$i" = 0 ]; then