Skip to content

Commit

Permalink
Merge pull request #222 from mysql/master
Browse files Browse the repository at this point in the history
Specify host for client login during init to ignore MYSQL_HOST value
  • Loading branch information
yosifkit authored Oct 24, 2016
2 parents 659ea23 + 8b08921 commit b2b4fcf
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion 5.5/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
"$@" --skip-networking --basedir=/usr/local/mysql &
pid="$!"

mysql=( mysql --protocol=socket -uroot )
mysql=( mysql --protocol=socket -uroot -hlocalhost)

for i in {30..0}; do
if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
Expand Down
2 changes: 1 addition & 1 deletion 5.6/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
"$@" --skip-networking &
pid="$!"

mysql=( mysql --protocol=socket -uroot )
mysql=( mysql --protocol=socket -uroot -hlocalhost)

for i in {30..0}; do
if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
Expand Down
2 changes: 1 addition & 1 deletion 5.7/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
"$@" --skip-networking &
pid="$!"

mysql=( mysql --protocol=socket -uroot )
mysql=( mysql --protocol=socket -uroot -hlocalhost)

for i in {30..0}; do
if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
Expand Down
2 changes: 1 addition & 1 deletion 8.0/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
"$@" --skip-networking &
pid="$!"

mysql=( mysql --protocol=socket -uroot )
mysql=( mysql --protocol=socket -uroot -hlocalhost)

for i in {30..0}; do
if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
Expand Down

0 comments on commit b2b4fcf

Please sign in to comment.