From 5e509f26deecebc6126663405330dc4215928c1e Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Mon, 6 Mar 2023 16:40:28 +0100
Subject: [PATCH] [bitnami/mariadb] Release 10.10.3-debian-11-r10 (#26446)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/mariadb/10.10/debian-11/Dockerfile                    | 4 ++--
 .../10.10/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh  | 2 +-
 bitnami/mariadb/README.md                                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bitnami/mariadb/10.10/debian-11/Dockerfile b/bitnami/mariadb/10.10/debian-11/Dockerfile
index 904c10c6c637..5aa68dc37f11 100644
--- a/bitnami/mariadb/10.10/debian-11/Dockerfile
+++ b/bitnami/mariadb/10.10/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-03-04T22:24:25Z" \
+      org.opencontainers.image.created="2023-03-06T15:18:11Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.10.3-debian-11-r9" \
+      org.opencontainers.image.ref.name="10.10.3-debian-11-r10" \
       org.opencontainers.image.title="mariadb" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.10.3"
diff --git a/bitnami/mariadb/10.10/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh b/bitnami/mariadb/10.10/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh
index 808629307378..ad659fc32820 100644
--- a/bitnami/mariadb/10.10/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh
+++ b/bitnami/mariadb/10.10/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh
@@ -765,7 +765,7 @@ mysql_upgrade() {
     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[@]}" --force
+        debug_execute "${DB_BIN_DIR}/mysql_upgrade" "${args[@]}" || echo "This installation is already upgraded"
     fi
 }
 
diff --git a/bitnami/mariadb/README.md b/bitnami/mariadb/README.md
index 56e5a414f6a9..2aba3b381799 100644
--- a/bitnami/mariadb/README.md
+++ b/bitnami/mariadb/README.md
@@ -651,7 +651,7 @@ docker-compose up mariadb
 
 ## Notable Changes
 
-### 10.2.41-debian-10-r12, 10.3.32-debian-10-r13, 10.4.22-debian-10-r13, 10.5.13-debian-10-r14 and 10.6.5-debian-10-r13
+### 10.2.41-debian-10-r12, 10.3.32-debian-10-r13, 10.4.22-debian-10-r13, 10.5.13-debian-10-r14, 10.6.5-debian-10-r13, 10.3.38-r5-debian-11, 10.4.28-r5-debian-11, 10.5.19-r5-debian-11, 10.6.12-r5-debian-11, 10.7.8-r5-debian-11, 10.8.7-r5-debian-11, 10.9.5-r5-debian-11 and 10.10.3-r6-debian-11     
 
 * The command `mysql_upgrade` no longer includes the flag `--force`. Nonetheless, it can be enabled by using the [mysql_upgrade] option group in the MariaDB configuration.