Skip to content

Commit 3ae1837

Browse files
committed
Merge pull request docker-library#144 from mysql/master
Workaround for MySQL bug #78957, which also affects 5.5 and 5.6
2 parents 712bbf7 + ace4c65 commit 3ae1837

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

5.5/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ fi
88

99
if [ "$1" = 'mysqld' ]; then
1010
# Get config
11-
DATADIR="$("$@" --verbose --help 2>/dev/null | awk '$1 == "datadir" { print $2; exit }')"
11+
DATADIR="$("$@" --verbose --help --log-bin-index=`mktemp -u` 2>/dev/null | awk '$1 == "datadir" { print $2; exit }')"
1212

1313
if [ ! -d "$DATADIR/mysql" ]; then
1414
if [ -z "$MYSQL_ROOT_PASSWORD" -a -z "$MYSQL_ALLOW_EMPTY_PASSWORD" -a -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then

5.6/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ fi
88

99
if [ "$1" = 'mysqld' ]; then
1010
# Get config
11-
DATADIR="$("$@" --verbose --help 2>/dev/null | awk '$1 == "datadir" { print $2; exit }')"
11+
DATADIR="$("$@" --verbose --help --log-bin-index=`mktemp -u` 2>/dev/null | awk '$1 == "datadir" { print $2; exit }')"
1212

1313
if [ ! -d "$DATADIR/mysql" ]; then
1414
if [ -z "$MYSQL_ROOT_PASSWORD" -a -z "$MYSQL_ALLOW_EMPTY_PASSWORD" -a -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then

0 commit comments

Comments
 (0)