Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mysql #8044

Merged
merged 1 commit into from
May 20, 2020
Merged

Update mysql #8044

merged 1 commit into from
May 20, 2020

Conversation

tianon
Copy link
Member

@tianon tianon commented May 20, 2020

Changes:

Changes:

- docker-library/mysql@bc6e37a: Merge pull request docker-library/mysql#500 from Istador/escape_database_wildcard
- docker-library/mysql@7a87af0: Escape database underscore wildcard
- docker-library/mysql@a769034: Merge pull request docker-library/mysql#667 from docker-library/github-actions
- docker-library/mysql@ab66888: Add initial GitHub Actions CI
@github-actions
Copy link

Diff for 910dfd8:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index dc9ddaa..d754cd8 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,13 +2,13 @@ Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosi
 GitRepo: https://github.com/docker-library/mysql.git
 
 Tags: 5.6.48, 5.6
-GitCommit: d2ba5f1fd5c1f4002253b80575de9c759d22bb1e
+GitCommit: bc6e37a2bed792b1c4fc6ab1ec3ce316e6a5f061
 Directory: 5.6
 
 Tags: 5.7.30, 5.7, 5
-GitCommit: 7397711170daed7ebba3bf373af143e5179906fc
+GitCommit: bc6e37a2bed792b1c4fc6ab1ec3ce316e6a5f061
 Directory: 5.7
 
 Tags: 8.0.20, 8.0, 8, latest
-GitCommit: fef511444a9d2867c9e4e20f5b4062bc071c20a2
+GitCommit: bc6e37a2bed792b1c4fc6ab1ec3ce316e6a5f061
 Directory: 8.0
diff --git a/mysql_5.6/docker-entrypoint.sh b/mysql_5.6/docker-entrypoint.sh
index 8db3567..6845ee4 100755
--- a/mysql_5.6/docker-entrypoint.sh
+++ b/mysql_5.6/docker-entrypoint.sh
@@ -284,7 +284,7 @@ docker_setup_db() {
 
 		if [ -n "$MYSQL_DATABASE" ]; then
 			mysql_note "Giving user ${MYSQL_USER} access to schema ${MYSQL_DATABASE}"
-			docker_process_sql --database=mysql <<<"GRANT ALL ON \`$MYSQL_DATABASE\`.* TO '$MYSQL_USER'@'%' ;"
+			docker_process_sql --database=mysql <<<"GRANT ALL ON \`${MYSQL_DATABASE//_/\\_}\`.* TO '$MYSQL_USER'@'%' ;"
 		fi
 
 		docker_process_sql --database=mysql <<<"FLUSH PRIVILEGES ;"
diff --git a/mysql_5/docker-entrypoint.sh b/mysql_5/docker-entrypoint.sh
index 8db3567..6845ee4 100755
--- a/mysql_5/docker-entrypoint.sh
+++ b/mysql_5/docker-entrypoint.sh
@@ -284,7 +284,7 @@ docker_setup_db() {
 
 		if [ -n "$MYSQL_DATABASE" ]; then
 			mysql_note "Giving user ${MYSQL_USER} access to schema ${MYSQL_DATABASE}"
-			docker_process_sql --database=mysql <<<"GRANT ALL ON \`$MYSQL_DATABASE\`.* TO '$MYSQL_USER'@'%' ;"
+			docker_process_sql --database=mysql <<<"GRANT ALL ON \`${MYSQL_DATABASE//_/\\_}\`.* TO '$MYSQL_USER'@'%' ;"
 		fi
 
 		docker_process_sql --database=mysql <<<"FLUSH PRIVILEGES ;"
diff --git a/mysql_latest/docker-entrypoint.sh b/mysql_latest/docker-entrypoint.sh
index 8db3567..6845ee4 100755
--- a/mysql_latest/docker-entrypoint.sh
+++ b/mysql_latest/docker-entrypoint.sh
@@ -284,7 +284,7 @@ docker_setup_db() {
 
 		if [ -n "$MYSQL_DATABASE" ]; then
 			mysql_note "Giving user ${MYSQL_USER} access to schema ${MYSQL_DATABASE}"
-			docker_process_sql --database=mysql <<<"GRANT ALL ON \`$MYSQL_DATABASE\`.* TO '$MYSQL_USER'@'%' ;"
+			docker_process_sql --database=mysql <<<"GRANT ALL ON \`${MYSQL_DATABASE//_/\\_}\`.* TO '$MYSQL_USER'@'%' ;"
 		fi
 
 		docker_process_sql --database=mysql <<<"FLUSH PRIVILEGES ;"

@tianon tianon merged commit 3636255 into docker-library:master May 20, 2020
@tianon tianon deleted the mysql branch May 20, 2020 22:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants