From 70bcd54ceabb2123f68122fce4f00b20c68c18d6 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Mon, 3 Feb 2025 19:42:07 +0100
Subject: [PATCH] Adjust parameters for mysqldump.

---
 borg2-backup-nc.sh | 17 ++++++++++-------
 borg2-backup.sh    | 16 ++++++++++------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/borg2-backup-nc.sh b/borg2-backup-nc.sh
index 821dde9..a279a84 100755
--- a/borg2-backup-nc.sh
+++ b/borg2-backup-nc.sh
@@ -212,6 +212,7 @@ DEFAULT_NC_DB_BACKUP_DIR="/data/backup/sql"
 
 DEFAULT_MYSQL_CREDENTIALS="-u root -S /run/mysqld/mysqld.sock"
 DEFAULT_MYSQL_PERFORMANCE_SETTINGS=false
+DEFAULT_MYSQL_MAX_ALLOWED_PACKET="512M"
 
 DEFAULT_BACKUP_OTHER_DIRECTORIES="/etc /home /root /var/spool/cron"
 
@@ -242,6 +243,7 @@ fi
 
 [[ -z "${MYSQL_CREDENTIALS}" ]] && MYSQL_CREDENTIALS="${DEFAULT_MYSQL_CREDENTIALS}"
 [[ -z "${MYSQL_PERFORMANCE_SETTINGS}" ]] && MYSQL_PERFORMANCE_SETTINGS=${DEFAULT_MYSQL_PERFORMANCE_SETTINGS}
+[[ -z "$MYSQL_MAX_ALLOWED_PACKET" ]] && MYSQL_MAX_ALLOWED_PACKET="${DEFAULT_MYSQL_MAX_ALLOWED_PACKET}"
 
 # -------------
 # - Job is already running?
@@ -665,22 +667,23 @@ fi
 #
 echononl "Create database backup .."
 
-mysql_max_allowed_packet="512M"
 cat << EOF >> ${BORG_LOG_FILE}
 mysqldump ${MYSQL_CREDENTIALS} \\
    --single-transaction \\
-   --max-allowed-packet=${mysql_max_allowed_packet} \\
+   --max-allowed-packet=${MYSQL_MAX_ALLOWED_PACKET} \\
    --routines \\
-   -h localhost \\
-   -e ${NC_DB} > ${NC_DB_BACKUP_DIR}/${NC_DB}-${backup_date}.sql
+   --triggers \\
+   --quick \\
+   --extended-insert ${NC_DB} > ${NC_DB_BACKUP_DIR}/${NC_DB}-${backup_date}.sql
 EOF
 
 mysqldump ${MYSQL_CREDENTIALS} \
    --single-transaction \
-   --max-allowed-packet=${mysql_max_allowed_packet} \
+   --max-allowed-packet=${MYSQL_MAX_ALLOWED_PACKET} \
    --routines \
-   -h localhost \
-   -e ${NC_DB} > ${NC_DB_BACKUP_DIR}/${NC_DB}-${backup_date}.sql 2> ${log_file}
+   --triggers \
+   --quick \
+   --extended-insert ${NC_DB} > ${NC_DB_BACKUP_DIR}/${NC_DB}-${backup_date}.sql 2> ${log_file}
 
 
 if [[ $? -gt 0 ]] ; then
diff --git a/borg2-backup.sh b/borg2-backup.sh
index 7e74340..fdcda81 100755
--- a/borg2-backup.sh
+++ b/borg2-backup.sh
@@ -643,16 +643,20 @@ EOF
 
       cat <<EOF >> ${BORG_LOG_FILE}
 mysqldump ${MYSQL_CREDENTIALS} \\
-   --single-transaction --routines \\
-   -h localhost \\
-   -e ${_db} > ${DB_BACKUP_DIR}/${_db}-mysql-${backup_date}.sql
+   --single-transaction \\
+   --routines \\
+   --triggers \\
+   --quick \\
+   --extended-insert ${_db} > ${DB_BACKUP_DIR}/${_db}-mysql-${backup_date}.sql
 
 EOF
 
       mysqldump $MYSQL_CREDENTIALS \
-         --single-transaction --routines \
-         -h localhost \
-         -e ${_db} > ${DB_BACKUP_DIR}/${_db}-mysql-${backup_date}.sql 2> ${log_file}
+         --single-transaction \
+         --routines \
+         --triggers \
+         --quick \
+         --extended-insert ${_db} > ${DB_BACKUP_DIR}/${_db}-mysql-${backup_date}.sql 2> ${log_file}
 
       if [[ -s "${log_file}" ]] ; then
          echo_failed