From b318082716672468c0e516e49bb29ee683ab7fbd Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Wed, 3 May 2023 09:42:40 +0100
Subject: [PATCH] [bitnami/mariadb] Release 10.11.2-debian-11-r22 (#32543)

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

diff --git a/bitnami/mariadb/10.11/debian-11/Dockerfile b/bitnami/mariadb/10.11/debian-11/Dockerfile
index e57ec6ac351e..58e766acbf43 100644
--- a/bitnami/mariadb/10.11/debian-11/Dockerfile
+++ b/bitnami/mariadb/10.11/debian-11/Dockerfile
@@ -4,10 +4,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:109c7d51bd69bb6b3df71017440c1ea0699454f81fe188056c083f0b57c96ea6" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-04-26T13:00:57Z" \
+      org.opencontainers.image.created="2023-05-03T08:20:49Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.11.2-debian-11-r21" \
+      org.opencontainers.image.ref.name="10.11.2-debian-11-r22" \
       org.opencontainers.image.title="mariadb" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.11.2"
diff --git a/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh b/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh
index edda878ab664..fe290f338235 100644
--- a/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh
+++ b/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh
@@ -200,6 +200,7 @@ CHANGE MASTER TO MASTER_HOST='$DB_MASTER_HOST',
 MASTER_PORT=$DB_MASTER_PORT_NUMBER,
 MASTER_USER='$DB_REPLICATION_USER',
 MASTER_PASSWORD='$DB_REPLICATION_PASSWORD',
+MASTER_DELAY=$DB_MASTER_DELAY,
 MASTER_CONNECT_RETRY=10;
 EOF
     elif [[ "$DB_REPLICATION_MODE" = "master" ]]; then
diff --git a/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh b/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh
index 2fb8a052fd84..74d0122c7654 100644
--- a/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh
+++ b/bitnami/mariadb/10.11/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh
@@ -33,6 +33,7 @@ mariadb_env_vars=(
     MARIADB_MASTER_PORT_NUMBER
     MARIADB_MASTER_ROOT_USER
     MARIADB_MASTER_ROOT_PASSWORD
+    MARIADB_MASTER_DELAY
     MARIADB_REPLICATION_USER
     MARIADB_REPLICATION_PASSWORD
     MARIADB_PORT_NUMBER
@@ -120,6 +121,8 @@ export MARIADB_MASTER_ROOT_USER="${MARIADB_MASTER_ROOT_USER:-root}"
 export DB_MASTER_ROOT_USER="$MARIADB_MASTER_ROOT_USER" # only used during the first initialization
 export MARIADB_MASTER_ROOT_PASSWORD="${MARIADB_MASTER_ROOT_PASSWORD:-}"
 export DB_MASTER_ROOT_PASSWORD="$MARIADB_MASTER_ROOT_PASSWORD" # only used during the first initialization
+export MARIADB_MASTER_DELAY="${MARIADB_MASTER_DELAY:-0}"
+export DB_MASTER_DELAY="$MARIADB_MASTER_DELAY" # only used during the first initialization
 export MARIADB_REPLICATION_USER="${MARIADB_REPLICATION_USER:-}"
 export DB_REPLICATION_USER="$MARIADB_REPLICATION_USER" # only used during the first initialization
 export MARIADB_REPLICATION_PASSWORD="${MARIADB_REPLICATION_PASSWORD:-}"
diff --git a/bitnami/mariadb/README.md b/bitnami/mariadb/README.md
index 09154508b88d..aae51e383f43 100644
--- a/bitnami/mariadb/README.md
+++ b/bitnami/mariadb/README.md
@@ -359,6 +359,7 @@ A **zero downtime** MariaDB master-slave [replication](https://dev.mysql.com/doc
 * `MARIADB_MASTER_ROOT_USER`: User on replication master with access to `MARIADB_DATABASE` (slave parameter). Defaults to `root`
 * `MARIADB_MASTER_ROOT_PASSWORD`: Password of user on replication master with access to `MARIADB_DATABASE` (slave parameter). No defaults.
 * `MARIADB_MASTER_ROOT_PASSWORD_FILE`: Path to a file that contains the password of user on replication master with access to `MARIADB_DATABASE`. This will override the value specified in `MARIADB_MASTER_ROOT_PASSWORD`. No defaults.
+* `MARIADB_MASTER_DELAY`: The database replication delay (slave parameter). Defaults to `0`.
 
 In a replication cluster you can have one master and zero or more slaves. When replication is enabled the master node is in read-write mode, while the slaves are in read-only mode. For best performance its advisable to limit the reads to the slaves.