Skip to content

Commit 1a70331

Browse files
authored
Merge pull request #1065 from LaurentGoderre/fix-816
Support running server with autocommit
2 parents c857c9c + 319db56 commit 1a70331

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

8.0/docker-entrypoint.sh

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.4/docker-entrypoint.sh

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker-entrypoint.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,8 @@ docker_create_db_directories() {
214214
# initializes the database directory
215215
docker_init_database_dir() {
216216
mysql_note "Initializing database files"
217-
"$@" --initialize-insecure --default-time-zone=SYSTEM
217+
"$@" --initialize-insecure --default-time-zone=SYSTEM --autocommit=1
218+
# 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)
218219
mysql_note "Database files initialized"
219220
}
220221

@@ -292,6 +293,9 @@ docker_setup_db() {
292293

293294
# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is just now being set
294295
docker_process_sql --dont-use-mysql-root-password --database=mysql <<-EOSQL
296+
-- enable autocommit explicitly (in case it was disabled globally)
297+
SET autocommit = 1;
298+
295299
-- What's done in this file shouldn't be replicated
296300
-- or products like mysql-fabric won't work
297301
SET @@SESSION.SQL_LOG_BIN=0;

innovation/docker-entrypoint.sh

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)