From 3ee3f086ef9ff5eb45b6d306eb0c7d2337b6b6cb Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 3 Mar 2022 05:39:01 +0000
Subject: [PATCH] 5.9.1-debian-10-r7 release

---
 bitnami/wordpress-intel/5/debian-10/Dockerfile     |  4 ++--
 .../rootfs/opt/bitnami/scripts/libmysqlclient.sh   | 14 ++++++++++----
 bitnami/wordpress-intel/README.md                  |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/bitnami/wordpress-intel/5/debian-10/Dockerfile b/bitnami/wordpress-intel/5/debian-10/Dockerfile
index 8f756dd6cf60..be983ffc57d0 100644
--- a/bitnami/wordpress-intel/5/debian-10/Dockerfile
+++ b/bitnami/wordpress-intel/5/debian-10/Dockerfile
@@ -24,13 +24,13 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
 RUN /opt/bitnami/scripts/qatengine/postunpack.sh
-RUN /opt/bitnami/scripts/nginx/postunpack.sh
 RUN /opt/bitnami/scripts/php/postunpack.sh
+RUN /opt/bitnami/scripts/nginx/postunpack.sh
 RUN /opt/bitnami/scripts/nginx-php-fpm/postunpack.sh
 RUN /opt/bitnami/scripts/wordpress/postunpack.sh
 RUN /opt/bitnami/scripts/wp-cli/postunpack.sh
 ENV BITNAMI_APP_NAME="wordpress-intel" \
-    BITNAMI_IMAGE_VERSION="5.9.1-debian-10-r6" \
+    BITNAMI_IMAGE_VERSION="5.9.1-debian-10-r7" \
     NGINX_HTTPS_PORT_NUMBER="" \
     NGINX_HTTP_PORT_NUMBER="" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/wp-cli/bin:/opt/bitnami/nginx/sbin:/opt/bitnami/mysql/bin:$PATH"
diff --git a/bitnami/wordpress-intel/5/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/wordpress-intel/5/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index 9609635e63a3..fee929c4ee1a 100644
--- a/bitnami/wordpress-intel/5/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/wordpress-intel/5/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -241,10 +241,16 @@ mysql_execute_print_output() {
     [[ "${#extra_opts[@]}" -gt 0 ]] && args+=("${extra_opts[@]}")
 
     # Obtain the command specified via stdin
-    local mysql_cmd
-    mysql_cmd="$(</dev/stdin)"
-    debug "Executing SQL command:\n$mysql_cmd"
-    "$DB_BIN_DIR/mysql" "${args[@]}" <<<"$mysql_cmd"
+    if [[ "${BITNAMI_DEBUG:-false}" = true ]]; then
+        local mysql_cmd
+        mysql_cmd="$(</dev/stdin)"
+        debug "Executing SQL command:\n$mysql_cmd"
+        "$DB_BIN_DIR/mysql" "${args[@]}" <<<"$mysql_cmd"
+    else
+        # Do not store the command(s) as a variable, to avoid issues when importing large files
+        # https://github.com/bitnami/bitnami-docker-mariadb/issues/251
+        "$DB_BIN_DIR/mysql" "${args[@]}"
+    fi
 }
 
 ########################
diff --git a/bitnami/wordpress-intel/README.md b/bitnami/wordpress-intel/README.md
index 3e643cbcc921..cb45c34e177c 100644
--- a/bitnami/wordpress-intel/README.md
+++ b/bitnami/wordpress-intel/README.md
@@ -51,7 +51,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-- [`5`, `5-debian-10`, `5.9.1`, `5.9.1-debian-10-r6`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.9.1-debian-10-r6/5/debian-10/Dockerfile)
+- [`5`, `5-debian-10`, `5.9.1`, `5.9.1-debian-10-r7`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.9.1-debian-10-r7/5/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/wordpress GitHub repo](https://github.com/bitnami/bitnami-docker-wordpress).