From 0a8348e3a3d77dc664805e5674f805b66ae23ede Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 2 Jul 2024 17:08:10 +0200
Subject: [PATCH] [bitnami/mysql] Release 8.0.38-debian-12-r1 (#68565)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/mysql/8.0/debian-12/Dockerfile        |  6 +++---
 .../opt/bitnami/.bitnami_components.json      |  2 +-
 .../rootfs/opt/bitnami/scripts/libmysql.sh    | 20 +++----------------
 .../rootfs/opt/bitnami/scripts/mysql-env.sh   |  3 +++
 4 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/bitnami/mysql/8.0/debian-12/Dockerfile b/bitnami/mysql/8.0/debian-12/Dockerfile
index 2786387f12b9..22e4240aae68 100644
--- a/bitnami/mysql/8.0/debian-12/Dockerfile
+++ b/bitnami/mysql/8.0/debian-12/Dockerfile
@@ -7,11 +7,11 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-07-01T14:59:41Z" \
+      org.opencontainers.image.created="2024-07-02T14:37:51Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/mysql/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.0.38-debian-12-r0" \
+      org.opencontainers.image.ref.name="8.0.38-debian-12-r1" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mysql" \
       org.opencontainers.image.title="mysql" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -29,7 +29,7 @@ RUN install_packages ca-certificates curl gcc-11 libaio1 libcom-err2 libgcc-s1 l
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
       "ini-file-1.4.6-14-linux-${OS_ARCH}-debian-12" \
-      "mysql-8.0.38-0-linux-${OS_ARCH}-debian-12" \
+      "mysql-8.0.38-1-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/mysql/8.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mysql/8.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 124b4f9cda5b..1c6a487d7389 100644
--- a/bitnami/mysql/8.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/mysql/8.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,6 +9,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "8.0.38-0"
+        "version": "8.0.38-1"
     }
 }
\ No newline at end of file
diff --git a/bitnami/mysql/8.0/debian-12/rootfs/opt/bitnami/scripts/libmysql.sh b/bitnami/mysql/8.0/debian-12/rootfs/opt/bitnami/scripts/libmysql.sh
index f4d8c285804e..2fe2d93bf919 100644
--- a/bitnami/mysql/8.0/debian-12/rootfs/opt/bitnami/scripts/libmysql.sh
+++ b/bitnami/mysql/8.0/debian-12/rootfs/opt/bitnami/scripts/libmysql.sh
@@ -332,23 +332,9 @@ mysql_install_db() {
 #   None
 #########################
 mysql_upgrade() {
-    local -a args=("--defaults-file=${DB_CONF_FILE}" "-u" "$DB_ROOT_USER")
-    local major_version minor_version patch_version
-    major_version="$(get_sematic_version "$(mysql_get_version)" 1)"
-    minor_version="$(get_sematic_version "$(mysql_get_version)" 2)"
-    patch_version="$(get_sematic_version "$(mysql_get_version)" 3)"
     info "Running mysql_upgrade"
-    if [[ "$major_version" -gt "8"
-        || ( "$major_version" -eq "8" && "$minor_version" -gt "0" )
-        || ( "$major_version" -eq "8" && "$minor_version" -eq "0" && "$patch_version" -ge "16" )
-    ]]; then
-        mysql_stop
-        mysql_start_bg "--upgrade=FORCE"
-    else
-        mysql_start_bg
-        is_boolean_yes "${ROOT_AUTH_ENABLED:-false}" && args+=("-p$(get_master_env_var_value ROOT_PASSWORD)")
-        debug_execute "${DB_BIN_DIR}/mysql_upgrade" "${args[@]}" || echo "This installation is already upgraded"
-    fi
+    mysql_stop
+    mysql_start_bg "--upgrade=${DB_UPGRADE}"
 }
 
 ########################
@@ -409,7 +395,7 @@ mysql_initialize() {
         # commands can still be executed until we restart or run 'flush privileges'
         info "Configuring authentication"
         mysql_execute "mysql" <<EOF
-DELETE FROM mysql.user WHERE user not in ('mysql.sys','mariadb.sys');
+DELETE FROM mysql.user WHERE user not in ('mysql.sys','mysql.infoschema','mysql.session','mariadb.sys');
 EOF
         # slaves do not need to configure users
         if [[ -z "$DB_REPLICATION_MODE" ]] || [[ "$DB_REPLICATION_MODE" = "master" ]]; then
diff --git a/bitnami/mysql/8.0/debian-12/rootfs/opt/bitnami/scripts/mysql-env.sh b/bitnami/mysql/8.0/debian-12/rootfs/opt/bitnami/scripts/mysql-env.sh
index fbfa035bc12a..5c59766b6f7b 100644
--- a/bitnami/mysql/8.0/debian-12/rootfs/opt/bitnami/scripts/mysql-env.sh
+++ b/bitnami/mysql/8.0/debian-12/rootfs/opt/bitnami/scripts/mysql-env.sh
@@ -47,6 +47,7 @@ mysql_env_vars=(
     MYSQL_COLLATE
     MYSQL_BIND_ADDRESS
     MYSQL_SQL_MODE
+    MYSQL_UPGRADE
     MYSQL_IS_DEDICATED_SERVER
     MYSQL_CLIENT_ENABLE_SSL
     MYSQL_CLIENT_SSL_CA_FILE
@@ -151,6 +152,8 @@ export MYSQL_BIND_ADDRESS="${MYSQL_BIND_ADDRESS:-}"
 export DB_BIND_ADDRESS="$MYSQL_BIND_ADDRESS"
 export MYSQL_SQL_MODE="${MYSQL_SQL_MODE:-}"
 export DB_SQL_MODE="$MYSQL_SQL_MODE"
+export MYSQL_UPGRADE="${MYSQL_UPGRADE:-AUTO}"
+export DB_UPGRADE="$MYSQL_UPGRADE"
 export MYSQL_IS_DEDICATED_SERVER="${MYSQL_IS_DEDICATED_SERVER:-}"
 export DB_IS_DEDICATED_SERVER="$MYSQL_IS_DEDICATED_SERVER"
 export MYSQL_CLIENT_ENABLE_SSL="${MYSQL_CLIENT_ENABLE_SSL:-no}"