From 8eb45156c1adecae759f0bc57406bdd170829b4f Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 7 Feb 2019 11:47:55 +1100 Subject: [PATCH] FLUSH PRIVILEGES not required after CREATE USER/GRANT --- 5.5/docker-entrypoint.sh | 2 -- 5.6/docker-entrypoint.sh | 2 -- 5.7/docker-entrypoint.sh | 2 -- 8.0/docker-entrypoint.sh | 2 -- template/docker-entrypoint.sh | 2 -- 5 files changed, 10 deletions(-) diff --git a/5.5/docker-entrypoint.sh b/5.5/docker-entrypoint.sh index a75e774f..431ddec7 100755 --- a/5.5/docker-entrypoint.sh +++ b/5.5/docker-entrypoint.sh @@ -141,8 +141,6 @@ EOF if [ "$MYSQL_DATABASE" ]; then echo "GRANT ALL ON \`"$MYSQL_DATABASE"\`.* TO '"$MYSQL_USER"'@'%' ;" | "${mysql[@]}" fi - - echo 'FLUSH PRIVILEGES ;' | "${mysql[@]}" elif [ "$MYSQL_USER" -a ! "$MYSQL_PASSWORD" -o ! "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then echo '[Entrypoint] Not creating mysql user. MYSQL_USER and MYSQL_PASSWORD must be specified to create a mysql user.' fi diff --git a/5.6/docker-entrypoint.sh b/5.6/docker-entrypoint.sh index a2bd3031..c7a959dd 100755 --- a/5.6/docker-entrypoint.sh +++ b/5.6/docker-entrypoint.sh @@ -141,8 +141,6 @@ EOF if [ "$MYSQL_DATABASE" ]; then echo "GRANT ALL ON \`"$MYSQL_DATABASE"\`.* TO '"$MYSQL_USER"'@'%' ;" | "${mysql[@]}" fi - - echo 'FLUSH PRIVILEGES ;' | "${mysql[@]}" elif [ "$MYSQL_USER" -a ! "$MYSQL_PASSWORD" -o ! "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then echo '[Entrypoint] Not creating mysql user. MYSQL_USER and MYSQL_PASSWORD must be specified to create a mysql user.' fi diff --git a/5.7/docker-entrypoint.sh b/5.7/docker-entrypoint.sh index 11a1aade..8b404ba6 100755 --- a/5.7/docker-entrypoint.sh +++ b/5.7/docker-entrypoint.sh @@ -141,8 +141,6 @@ EOF if [ "$MYSQL_DATABASE" ]; then echo "GRANT ALL ON \`"$MYSQL_DATABASE"\`.* TO '"$MYSQL_USER"'@'%' ;" | "${mysql[@]}" fi - - echo 'FLUSH PRIVILEGES ;' | "${mysql[@]}" elif [ "$MYSQL_USER" -a ! "$MYSQL_PASSWORD" -o ! "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then echo '[Entrypoint] Not creating mysql user. MYSQL_USER and MYSQL_PASSWORD must be specified to create a mysql user.' fi diff --git a/8.0/docker-entrypoint.sh b/8.0/docker-entrypoint.sh index 8c0542c6..3ad404ef 100755 --- a/8.0/docker-entrypoint.sh +++ b/8.0/docker-entrypoint.sh @@ -141,8 +141,6 @@ EOF if [ "$MYSQL_DATABASE" ]; then echo "GRANT ALL ON \`"$MYSQL_DATABASE"\`.* TO '"$MYSQL_USER"'@'%' ;" | "${mysql[@]}" fi - - echo 'FLUSH PRIVILEGES ;' | "${mysql[@]}" elif [ "$MYSQL_USER" -a ! "$MYSQL_PASSWORD" -o ! "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then echo '[Entrypoint] Not creating mysql user. MYSQL_USER and MYSQL_PASSWORD must be specified to create a mysql user.' fi diff --git a/template/docker-entrypoint.sh b/template/docker-entrypoint.sh index 806f213b..a2a1a7db 100644 --- a/template/docker-entrypoint.sh +++ b/template/docker-entrypoint.sh @@ -141,8 +141,6 @@ EOF if [ "$MYSQL_DATABASE" ]; then echo "GRANT ALL ON \`"$MYSQL_DATABASE"\`.* TO '"$MYSQL_USER"'@'%' ;" | "${mysql[@]}" fi - - echo 'FLUSH PRIVILEGES ;' | "${mysql[@]}" elif [ "$MYSQL_USER" -a ! "$MYSQL_PASSWORD" -o ! "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then echo '[Entrypoint] Not creating mysql user. MYSQL_USER and MYSQL_PASSWORD must be specified to create a mysql user.' fi