-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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 #17010
Merged
Merged
Update mysql #17010
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/mysql@1a70331: Merge pull request docker-library/mysql#1065 from LaurentGoderre/fix-816 - docker-library/mysql@319db56: Support running server with autocommit
Diff for b23c0e3:diff --git a/_bashbrew-cat b/_bashbrew-cat
index a06d846..4203b8e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,17 +3,17 @@ GitRepo: https://github.com/docker-library/mysql.git
Tags: 8.0.37, 8.0, 8.0.37-oraclelinux9, 8.0-oraclelinux9, 8.0.37-oracle, 8.0-oracle
Architectures: amd64, arm64v8
-GitCommit: a15b34a032f48089ee7b02d307d8f89a96b3bb76
+GitCommit: 319db566ac7fef45c22f3df15ee5e194a7c43259
Directory: 8.0
File: Dockerfile.oracle
Tags: 8.0.37-bookworm, 8.0-bookworm, 8.0.37-debian, 8.0-debian
-GitCommit: 5fe2b708e9734809d7f6554c131f0371d517bb22
+GitCommit: 319db566ac7fef45c22f3df15ee5e194a7c43259
Directory: 8.0
File: Dockerfile.debian
Tags: 8.4.0, 8.4, 8, lts, latest, innovation, 8.4.0-oraclelinux9, 8.4-oraclelinux9, 8-oraclelinux9, lts-oraclelinux9, oraclelinux9, innovation-oraclelinux9, 8.4.0-oracle, 8.4-oracle, 8-oracle, lts-oracle, oracle, innovation-oracle
Architectures: amd64, arm64v8
-GitCommit: a15b34a032f48089ee7b02d307d8f89a96b3bb76
+GitCommit: 319db566ac7fef45c22f3df15ee5e194a7c43259
Directory: 8.4
File: Dockerfile.oracle
diff --git a/mysql_8.0-debian/docker-entrypoint.sh b/mysql_8.0-debian/docker-entrypoint.sh
index 8cb17c4..e635e07 100755
--- a/mysql_8.0-debian/docker-entrypoint.sh
+++ b/mysql_8.0-debian/docker-entrypoint.sh
@@ -214,7 +214,8 @@ docker_create_db_directories() {
# initializes the database directory
docker_init_database_dir() {
mysql_note "Initializing database files"
- "$@" --initialize-insecure --default-time-zone=SYSTEM
+ "$@" --initialize-insecure --default-time-zone=SYSTEM --autocommit=1
+ # explicitly enable autocommit to combat https://bugs.mysql.com/bug.php?id=110535 (TODO remove this when 8.0 is EOL; see https://github.com/mysql/mysql-server/commit/7dbf4f80ed15f3c925cfb2b834142f23a2de719a)
mysql_note "Database files initialized"
}
@@ -292,6 +293,9 @@ docker_setup_db() {
# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is just now being set
docker_process_sql --dont-use-mysql-root-password --database=mysql <<-EOSQL
+ -- enable autocommit explicitly (in case it was disabled globally)
+ SET autocommit = 1;
+
-- What's done in this file shouldn't be replicated
-- or products like mysql-fabric won't work
SET @@SESSION.SQL_LOG_BIN=0;
diff --git a/mysql_8.0-oracle/docker-entrypoint.sh b/mysql_8.0-oracle/docker-entrypoint.sh
index 8cb17c4..e635e07 100755
--- a/mysql_8.0-oracle/docker-entrypoint.sh
+++ b/mysql_8.0-oracle/docker-entrypoint.sh
@@ -214,7 +214,8 @@ docker_create_db_directories() {
# initializes the database directory
docker_init_database_dir() {
mysql_note "Initializing database files"
- "$@" --initialize-insecure --default-time-zone=SYSTEM
+ "$@" --initialize-insecure --default-time-zone=SYSTEM --autocommit=1
+ # explicitly enable autocommit to combat https://bugs.mysql.com/bug.php?id=110535 (TODO remove this when 8.0 is EOL; see https://github.com/mysql/mysql-server/commit/7dbf4f80ed15f3c925cfb2b834142f23a2de719a)
mysql_note "Database files initialized"
}
@@ -292,6 +293,9 @@ docker_setup_db() {
# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is just now being set
docker_process_sql --dont-use-mysql-root-password --database=mysql <<-EOSQL
+ -- enable autocommit explicitly (in case it was disabled globally)
+ SET autocommit = 1;
+
-- What's done in this file shouldn't be replicated
-- or products like mysql-fabric won't work
SET @@SESSION.SQL_LOG_BIN=0;
diff --git a/mysql_innovation-oracle/docker-entrypoint.sh b/mysql_innovation-oracle/docker-entrypoint.sh
index 8cb17c4..e635e07 100755
--- a/mysql_innovation-oracle/docker-entrypoint.sh
+++ b/mysql_innovation-oracle/docker-entrypoint.sh
@@ -214,7 +214,8 @@ docker_create_db_directories() {
# initializes the database directory
docker_init_database_dir() {
mysql_note "Initializing database files"
- "$@" --initialize-insecure --default-time-zone=SYSTEM
+ "$@" --initialize-insecure --default-time-zone=SYSTEM --autocommit=1
+ # explicitly enable autocommit to combat https://bugs.mysql.com/bug.php?id=110535 (TODO remove this when 8.0 is EOL; see https://github.com/mysql/mysql-server/commit/7dbf4f80ed15f3c925cfb2b834142f23a2de719a)
mysql_note "Database files initialized"
}
@@ -292,6 +293,9 @@ docker_setup_db() {
# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is just now being set
docker_process_sql --dont-use-mysql-root-password --database=mysql <<-EOSQL
+ -- enable autocommit explicitly (in case it was disabled globally)
+ SET autocommit = 1;
+
-- What's done in this file shouldn't be replicated
-- or products like mysql-fabric won't work
SET @@SESSION.SQL_LOG_BIN=0; Relevant Maintainers: |
yosifkit
approved these changes
Jun 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: