From ab5ad150cdec38805cfb21aad85155bdeca2bc19 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Mon, 26 Sep 2022 20:09:06 +1000 Subject: [PATCH] #44 workaround not required any more due to MDEV-25728 --- 10.10/docker-entrypoint.sh | 1 - 10.11/docker-entrypoint.sh | 1 - 10.3/docker-entrypoint.sh | 1 - 10.4/docker-entrypoint.sh | 1 - 10.5/docker-entrypoint.sh | 1 - 10.6/docker-entrypoint.sh | 1 - 10.7/docker-entrypoint.sh | 1 - 10.8/docker-entrypoint.sh | 1 - 10.9/docker-entrypoint.sh | 1 - docker-entrypoint.sh | 1 - 10 files changed, 10 deletions(-) diff --git a/10.10/docker-entrypoint.sh b/10.10/docker-entrypoint.sh index bd674b3..ff09512 100755 --- a/10.10/docker-entrypoint.sh +++ b/10.10/docker-entrypoint.sh @@ -98,7 +98,6 @@ docker_process_init_files() { # arguments necessary to run "mariadbd --verbose --help" successfully (used for testing configuration validity and for extracting default/configured values) _verboseHelpArgs=( --verbose --help - --log-bin-index="$(mktemp -u)" # https://github.com/docker-library/mysql/issues/136 ) mysql_check_config() { diff --git a/10.11/docker-entrypoint.sh b/10.11/docker-entrypoint.sh index bd674b3..ff09512 100755 --- a/10.11/docker-entrypoint.sh +++ b/10.11/docker-entrypoint.sh @@ -98,7 +98,6 @@ docker_process_init_files() { # arguments necessary to run "mariadbd --verbose --help" successfully (used for testing configuration validity and for extracting default/configured values) _verboseHelpArgs=( --verbose --help - --log-bin-index="$(mktemp -u)" # https://github.com/docker-library/mysql/issues/136 ) mysql_check_config() { diff --git a/10.3/docker-entrypoint.sh b/10.3/docker-entrypoint.sh index bacd0ef..6ea97ab 100755 --- a/10.3/docker-entrypoint.sh +++ b/10.3/docker-entrypoint.sh @@ -98,7 +98,6 @@ docker_process_init_files() { # arguments necessary to run "mysqld --verbose --help" successfully (used for testing configuration validity and for extracting default/configured values) _verboseHelpArgs=( --verbose --help - --log-bin-index="$(mktemp -u)" # https://github.com/docker-library/mysql/issues/136 ) mysql_check_config() { diff --git a/10.4/docker-entrypoint.sh b/10.4/docker-entrypoint.sh index bacd0ef..6ea97ab 100755 --- a/10.4/docker-entrypoint.sh +++ b/10.4/docker-entrypoint.sh @@ -98,7 +98,6 @@ docker_process_init_files() { # arguments necessary to run "mysqld --verbose --help" successfully (used for testing configuration validity and for extracting default/configured values) _verboseHelpArgs=( --verbose --help - --log-bin-index="$(mktemp -u)" # https://github.com/docker-library/mysql/issues/136 ) mysql_check_config() { diff --git a/10.5/docker-entrypoint.sh b/10.5/docker-entrypoint.sh index bacd0ef..6ea97ab 100755 --- a/10.5/docker-entrypoint.sh +++ b/10.5/docker-entrypoint.sh @@ -98,7 +98,6 @@ docker_process_init_files() { # arguments necessary to run "mysqld --verbose --help" successfully (used for testing configuration validity and for extracting default/configured values) _verboseHelpArgs=( --verbose --help - --log-bin-index="$(mktemp -u)" # https://github.com/docker-library/mysql/issues/136 ) mysql_check_config() { diff --git a/10.6/docker-entrypoint.sh b/10.6/docker-entrypoint.sh index bd674b3..ff09512 100755 --- a/10.6/docker-entrypoint.sh +++ b/10.6/docker-entrypoint.sh @@ -98,7 +98,6 @@ docker_process_init_files() { # arguments necessary to run "mariadbd --verbose --help" successfully (used for testing configuration validity and for extracting default/configured values) _verboseHelpArgs=( --verbose --help - --log-bin-index="$(mktemp -u)" # https://github.com/docker-library/mysql/issues/136 ) mysql_check_config() { diff --git a/10.7/docker-entrypoint.sh b/10.7/docker-entrypoint.sh index bd674b3..ff09512 100755 --- a/10.7/docker-entrypoint.sh +++ b/10.7/docker-entrypoint.sh @@ -98,7 +98,6 @@ docker_process_init_files() { # arguments necessary to run "mariadbd --verbose --help" successfully (used for testing configuration validity and for extracting default/configured values) _verboseHelpArgs=( --verbose --help - --log-bin-index="$(mktemp -u)" # https://github.com/docker-library/mysql/issues/136 ) mysql_check_config() { diff --git a/10.8/docker-entrypoint.sh b/10.8/docker-entrypoint.sh index bd674b3..ff09512 100755 --- a/10.8/docker-entrypoint.sh +++ b/10.8/docker-entrypoint.sh @@ -98,7 +98,6 @@ docker_process_init_files() { # arguments necessary to run "mariadbd --verbose --help" successfully (used for testing configuration validity and for extracting default/configured values) _verboseHelpArgs=( --verbose --help - --log-bin-index="$(mktemp -u)" # https://github.com/docker-library/mysql/issues/136 ) mysql_check_config() { diff --git a/10.9/docker-entrypoint.sh b/10.9/docker-entrypoint.sh index bd674b3..ff09512 100755 --- a/10.9/docker-entrypoint.sh +++ b/10.9/docker-entrypoint.sh @@ -98,7 +98,6 @@ docker_process_init_files() { # arguments necessary to run "mariadbd --verbose --help" successfully (used for testing configuration validity and for extracting default/configured values) _verboseHelpArgs=( --verbose --help - --log-bin-index="$(mktemp -u)" # https://github.com/docker-library/mysql/issues/136 ) mysql_check_config() { diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index bacd0ef..6ea97ab 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -98,7 +98,6 @@ docker_process_init_files() { # arguments necessary to run "mysqld --verbose --help" successfully (used for testing configuration validity and for extracting default/configured values) _verboseHelpArgs=( --verbose --help - --log-bin-index="$(mktemp -u)" # https://github.com/docker-library/mysql/issues/136 ) mysql_check_config() {