From 458420f095487cb35346ce1f199461a3c630a3d6 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 1 May 2020 15:45:46 +0000
Subject: [PATCH] 5.7.30-debian-10-r7 release

---
 bitnami/mysql/5.7/debian-10/Dockerfile                      | 2 +-
 .../5.7/debian-10/rootfs/opt/bitnami/scripts/libmysql.sh    | 6 +-----
 bitnami/mysql/README.md                                     | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/bitnami/mysql/5.7/debian-10/Dockerfile b/bitnami/mysql/5.7/debian-10/Dockerfile
index 7572686eae16..de0d19be03b8 100644
--- a/bitnami/mysql/5.7/debian-10/Dockerfile
+++ b/bitnami/mysql/5.7/debian-10/Dockerfile
@@ -19,7 +19,7 @@ RUN mkdir /docker-entrypoint-initdb.d
 COPY rootfs /
 RUN /opt/bitnami/scripts/mysql/postunpack.sh
 ENV BITNAMI_APP_NAME="mysql" \
-    BITNAMI_IMAGE_VERSION="5.7.30-debian-10-r6" \
+    BITNAMI_IMAGE_VERSION="5.7.30-debian-10-r7" \
     NAMI_PREFIX="/.nami" \
     PATH="/opt/bitnami/mysql/bin:/opt/bitnami/mysql/sbin:/opt/bitnami/common/bin:$PATH"
 
diff --git a/bitnami/mysql/5.7/debian-10/rootfs/opt/bitnami/scripts/libmysql.sh b/bitnami/mysql/5.7/debian-10/rootfs/opt/bitnami/scripts/libmysql.sh
index 020b12eac132..50d319e4afbe 100644
--- a/bitnami/mysql/5.7/debian-10/rootfs/opt/bitnami/scripts/libmysql.sh
+++ b/bitnami/mysql/5.7/debian-10/rootfs/opt/bitnami/scripts/libmysql.sh
@@ -693,11 +693,7 @@ mysql_start_bg() {
 
     # we cannot use wait_for_mysql_access here as mysql_upgrade for MySQL >=8 depends on this command
     # users are not configured on slave nodes during initialization due to --skip-slave-start
-    if [[ "${DB_REPLICATION_MODE:-}" != "slave" ]]; then
-        wait_for_mysql_access
-    else
-        wait_for_mysql
-    fi
+    wait_for_mysql
 
     # Special configuration flag for system with slow disks that could take more time
     # in initializing
diff --git a/bitnami/mysql/README.md b/bitnami/mysql/README.md
index d874f229d590..dac2badcdacc 100644
--- a/bitnami/mysql/README.md
+++ b/bitnami/mysql/README.md
@@ -45,7 +45,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`8.0-debian-10`, `8.0.20-debian-10-r3`, `8.0`, `8.0.20`, `latest` (8.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mysql/blob/8.0.20-debian-10-r3/8.0/debian-10/Dockerfile)
-* [`5.7-debian-10`, `5.7.30-debian-10-r6`, `5.7`, `5.7.30` (5.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mysql/blob/5.7.30-debian-10-r6/5.7/debian-10/Dockerfile)
+* [`5.7-debian-10`, `5.7.30-debian-10-r7`, `5.7`, `5.7.30` (5.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mysql/blob/5.7.30-debian-10-r7/5.7/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/mysql GitHub repo](https://github.com/bitnami/bitnami-docker-mysql).