From 49c630c2dd2cbd3227fba2142a826501e051189c Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 8 Apr 2022 08:55:14 +0000 Subject: [PATCH] 10.5.15-debian-10-r45 release --- .../rootfs/opt/bitnami/scripts/libmariadbgalera.sh | 2 ++ .../rootfs/opt/bitnami/scripts/mariadb-env.sh | 10 ++++++++++ bitnami/mariadb-galera/README.md | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/bitnami/mariadb-galera/10.5/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh b/bitnami/mariadb-galera/10.5/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh index 68bf8340c414..be64cb974a5a 100644 --- a/bitnami/mariadb-galera/10.5/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh +++ b/bitnami/mariadb-galera/10.5/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh @@ -1631,6 +1631,8 @@ mysql_update_custom_config() { ! is_empty_value "$DB_BIND_ADDRESS" && mysql_conf_set "bind_address" "$DB_BIND_ADDRESS" ! is_empty_value "$DB_AUTHENTICATION_PLUGIN" && mysql_conf_set "default_authentication_plugin" "$DB_AUTHENTICATION_PLUGIN" ! is_empty_value "$DB_SQL_MODE" && mysql_conf_set "sql_mode" "$DB_SQL_MODE" + ! is_empty_value "$DB_ENABLE_SLOW_QUERY" && mysql_conf_set "slow_query_log" "$DB_ENABLE_SLOW_QUERY" + ! is_empty_value "$DB_LONG_QUERY_TIME" && mysql_conf_set "long_query_time" "$DB_LONG_QUERY_TIME" # Avoid exit code of previous commands to affect the result of this function true diff --git a/bitnami/mariadb-galera/10.5/debian-10/rootfs/opt/bitnami/scripts/mariadb-env.sh b/bitnami/mariadb-galera/10.5/debian-10/rootfs/opt/bitnami/scripts/mariadb-env.sh index deba5da24994..53c9aa2b7196 100644 --- a/bitnami/mariadb-galera/10.5/debian-10/rootfs/opt/bitnami/scripts/mariadb-env.sh +++ b/bitnami/mariadb-galera/10.5/debian-10/rootfs/opt/bitnami/scripts/mariadb-env.sh @@ -51,6 +51,8 @@ mariadb_env_vars=( MARIADB_CLIENT_EXTRA_FLAGS MARIADB_STARTUP_WAIT_RETRIES MARIADB_STARTUP_WAIT_SLEEP_TIME + MARIADB_ENABLE_SLOW_QUERY + MARIADB_LONG_QUERY_TIME MARIADB_GALERA_CONF_DIR MARIADB_GALERA_MOUNTED_CONF_DIR MARIADB_GALERA_FORCE_SAFETOBOOTSTRAP @@ -69,6 +71,8 @@ mariadb_env_vars=( MARIADB_TLS_CA_FILE MARIADB_REPLICATION_USER MARIADB_REPLICATION_PASSWORD + DB_ENABLE_SLOW_QUERY + DB_LONG_QUERY_TIME ) for env_var in "${mariadb_env_vars[@]}"; do file_env_var="${env_var}_FILE" @@ -174,6 +178,12 @@ export MARIADB_STARTUP_WAIT_RETRIES="${MARIADB_STARTUP_WAIT_RETRIES:-300}" export DB_STARTUP_WAIT_RETRIES="$MARIADB_STARTUP_WAIT_RETRIES" export MARIADB_STARTUP_WAIT_SLEEP_TIME="${MARIADB_STARTUP_WAIT_SLEEP_TIME:-2}" export DB_STARTUP_WAIT_SLEEP_TIME="$MARIADB_STARTUP_WAIT_SLEEP_TIME" +MARIADB_ENABLE_SLOW_QUERY="${MARIADB_ENABLE_SLOW_QUERY:-"${DB_ENABLE_SLOW_QUERY:-}"}" +export MARIADB_ENABLE_SLOW_QUERY="${MARIADB_ENABLE_SLOW_QUERY:-0}" +export DB_ENABLE_SLOW_QUERY="$MARIADB_ENABLE_SLOW_QUERY" +MARIADB_LONG_QUERY_TIME="${MARIADB_LONG_QUERY_TIME:-"${DB_LONG_QUERY_TIME:-}"}" +export MARIADB_LONG_QUERY_TIME="${MARIADB_LONG_QUERY_TIME:-10.0}" +export DB_LONG_QUERY_TIME="$MARIADB_LONG_QUERY_TIME" # Galera paths export MARIADB_GALERA_GRASTATE_FILE="${DB_DATA_DIR}/grastate.dat" diff --git a/bitnami/mariadb-galera/README.md b/bitnami/mariadb-galera/README.md index f9c8fec4f1af..9e4f0e45e481 100644 --- a/bitnami/mariadb-galera/README.md +++ b/bitnami/mariadb-galera/README.md @@ -55,7 +55,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`10.7`, `10.7-debian-10`, `10.7.3`, `10.7.3-debian-10-r14`, `latest` (10.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.7.3-debian-10-r14/10.7/debian-10/Dockerfile) * [`10.6`, `10.6-debian-10`, `10.6.7`, `10.6.7-debian-10-r45` (10.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.6.7-debian-10-r45/10.6/debian-10/Dockerfile) -* [`10.5`, `10.5-debian-10`, `10.5.15`, `10.5.15-debian-10-r44` (10.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.5.15-debian-10-r44/10.5/debian-10/Dockerfile) +* [`10.5`, `10.5-debian-10`, `10.5.15`, `10.5.15-debian-10-r45` (10.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.5.15-debian-10-r45/10.5/debian-10/Dockerfile) * [`10.4`, `10.4-debian-10`, `10.4.24`, `10.4.24-debian-10-r46` (10.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.4.24-debian-10-r46/10.4/debian-10/Dockerfile) * [`10.3`, `10.3-debian-10`, `10.3.34`, `10.3.34-debian-10-r52` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.3.34-debian-10-r52/10.3/debian-10/Dockerfile) * [`10.2`, `10.2-debian-10`, `10.2.43`, `10.2.43-debian-10-r51` (10.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.2.43-debian-10-r51/10.2/debian-10/Dockerfile)