From cf065ec74bc6b27613f23d95a2cac95bc8dd83d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mart=C3=ADnez=20Montiel?= <rafael@payclip.com>
Date: Thu, 21 Jul 2016 09:57:14 -0500
Subject: [PATCH 1/2] Allow deep nesting on init path. FIXES:
 https://github.com/docker-library/mysql/issues/192

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

diff --git a/5.5/docker-entrypoint.sh b/5.5/docker-entrypoint.sh
index d62d76e00..4a4833316 100755
--- a/5.5/docker-entrypoint.sh
+++ b/5.5/docker-entrypoint.sh
@@ -104,7 +104,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 		fi
 
 		echo
-		for f in /docker-entrypoint-initdb.d/*; do
+		for f in $( find -type f /docker-entrypoint-initdb.d/ | sort ); do
 			case "$f" in
 				*.sh)     echo "$0: running $f"; . "$f" ;;
 				*.sql)    echo "$0: running $f"; "${mysql[@]}" < "$f"; echo ;;
diff --git a/5.6/docker-entrypoint.sh b/5.6/docker-entrypoint.sh
index a36575d0d..d78614f75 100755
--- a/5.6/docker-entrypoint.sh
+++ b/5.6/docker-entrypoint.sh
@@ -104,7 +104,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 		fi
 
 		echo
-		for f in /docker-entrypoint-initdb.d/*; do
+		for f in $( find -type f /docker-entrypoint-initdb.d/ | sort ); do
 			case "$f" in
 				*.sh)     echo "$0: running $f"; . "$f" ;;
 				*.sql)    echo "$0: running $f"; "${mysql[@]}" < "$f"; echo ;;
diff --git a/5.7/docker-entrypoint.sh b/5.7/docker-entrypoint.sh
index fc6aed26a..a28c35d9e 100755
--- a/5.7/docker-entrypoint.sh
+++ b/5.7/docker-entrypoint.sh
@@ -104,7 +104,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 		fi
 
 		echo
-		for f in /docker-entrypoint-initdb.d/*; do
+		for f in $( find -type f /docker-entrypoint-initdb.d/ | sort ); do
 			case "$f" in
 				*.sh)     echo "$0: running $f"; . "$f" ;;
 				*.sql)    echo "$0: running $f"; "${mysql[@]}" < "$f"; echo ;;

From c4426415e450133e452e868c7de369b588de0220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mart=C3=ADnez=20Montiel?= <rafael@payclip.com>
Date: Thu, 21 Jul 2016 17:16:57 -0500
Subject: [PATCH 2/2] Fix. order of parameters for entry point. allow nested
 paths on init scripts

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

diff --git a/5.5/docker-entrypoint.sh b/5.5/docker-entrypoint.sh
index 4a4833316..9795cdadf 100755
--- a/5.5/docker-entrypoint.sh
+++ b/5.5/docker-entrypoint.sh
@@ -104,7 +104,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 		fi
 
 		echo
-		for f in $( find -type f /docker-entrypoint-initdb.d/ | sort ); do
+		for f in $( find /docker-entrypoint-initdb.d/ -type f | sort ); do
 			case "$f" in
 				*.sh)     echo "$0: running $f"; . "$f" ;;
 				*.sql)    echo "$0: running $f"; "${mysql[@]}" < "$f"; echo ;;
diff --git a/5.6/docker-entrypoint.sh b/5.6/docker-entrypoint.sh
index d78614f75..f32827522 100755
--- a/5.6/docker-entrypoint.sh
+++ b/5.6/docker-entrypoint.sh
@@ -104,7 +104,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 		fi
 
 		echo
-		for f in $( find -type f /docker-entrypoint-initdb.d/ | sort ); do
+		for f in $( find /docker-entrypoint-initdb.d/ -type f | sort ); do
 			case "$f" in
 				*.sh)     echo "$0: running $f"; . "$f" ;;
 				*.sql)    echo "$0: running $f"; "${mysql[@]}" < "$f"; echo ;;
diff --git a/5.7/docker-entrypoint.sh b/5.7/docker-entrypoint.sh
index a28c35d9e..142d02482 100755
--- a/5.7/docker-entrypoint.sh
+++ b/5.7/docker-entrypoint.sh
@@ -104,7 +104,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 		fi
 
 		echo
-		for f in $( find -type f /docker-entrypoint-initdb.d/ | sort ); do
+		for f in $( find /docker-entrypoint-initdb.d/ -type f | sort ); do
 			case "$f" in
 				*.sh)     echo "$0: running $f"; . "$f" ;;
 				*.sql)    echo "$0: running $f"; "${mysql[@]}" < "$f"; echo ;;