From e8bc97a4c70d100bfb59cea0dd5ce11054b5b376 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 13 Jun 2023 09:53:23 +0200
Subject: [PATCH] [bitnami/mysql] Release 5.7.42-debian-11-r19 (#37397)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
Co-authored-by: Gonzalo Gomez Gracia <gonzalog@vmware.com>
---
 bitnami/mysql/5.7/debian-11/Dockerfile                        | 4 ++--
 .../5.7/debian-11/rootfs/opt/bitnami/scripts/libmysql.sh      | 2 +-
 .../debian-11/rootfs/opt/bitnami/scripts/mysql/postunpack.sh  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bitnami/mysql/5.7/debian-11/Dockerfile b/bitnami/mysql/5.7/debian-11/Dockerfile
index a23d90b45294..fd98e64b5c96 100644
--- a/bitnami/mysql/5.7/debian-11/Dockerfile
+++ b/bitnami/mysql/5.7/debian-11/Dockerfile
@@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-06-11T23:34:49Z" \
+      org.opencontainers.image.created="2023-06-12T17:38:12Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="5.7.42-debian-11-r18" \
+      org.opencontainers.image.ref.name="5.7.42-debian-11-r19" \
       org.opencontainers.image.title="mysql" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="5.7.42"
diff --git a/bitnami/mysql/5.7/debian-11/rootfs/opt/bitnami/scripts/libmysql.sh b/bitnami/mysql/5.7/debian-11/rootfs/opt/bitnami/scripts/libmysql.sh
index fe290f338235..ce88e048f2d1 100644
--- a/bitnami/mysql/5.7/debian-11/rootfs/opt/bitnami/scripts/libmysql.sh
+++ b/bitnami/mysql/5.7/debian-11/rootfs/opt/bitnami/scripts/libmysql.sh
@@ -158,11 +158,11 @@ max_allowed_packet=16M
 bind_address=${DB_DEFAULT_BIND_ADDRESS}
 log_error=${DB_LOGS_DIR}/mysqld.log
 slow_query_log=${DB_ENABLE_SLOW_QUERY}
-slow_query_log_file=${DB_LOGS_DIR}/mysqld.log
 long_query_time=${DB_LONG_QUERY_TIME}
 character_set_server=${DB_DEFAULT_CHARACTER_SET}
 collation_server=${DB_DEFAULT_COLLATE}
 plugin_dir=${DB_BASE_DIR}/lib/plugin
+datadir=${DB_DATA_DIR}
 
 [client]
 port=${DB_DEFAULT_PORT_NUMBER}
diff --git a/bitnami/mysql/5.7/debian-11/rootfs/opt/bitnami/scripts/mysql/postunpack.sh b/bitnami/mysql/5.7/debian-11/rootfs/opt/bitnami/scripts/mysql/postunpack.sh
index 3d1ed02290a8..2d515594b8ee 100755
--- a/bitnami/mysql/5.7/debian-11/rootfs/opt/bitnami/scripts/mysql/postunpack.sh
+++ b/bitnami/mysql/5.7/debian-11/rootfs/opt/bitnami/scripts/mysql/postunpack.sh
@@ -24,5 +24,5 @@ for dir in "$DB_TMP_DIR" "$DB_LOGS_DIR" "$DB_CONF_DIR" "${DB_CONF_DIR}/bitnami"
     chmod -R g+rwX "$dir"
 done
 
-# Redirect all logging to stdout
-ln -sf /dev/stdout "$DB_LOGS_DIR/mysqld.log"
+# Redirect logging to PID 1's stdout file descriptor including database initialization logs
+ln -sf /proc/1/fd/1 "$DB_LOGS_DIR/mysqld.log"