From 065887f789df51be81c4afc44d57794fe1057a6c Mon Sep 17 00:00:00 2001
From: Dave Conroy <dave@tiredofit.ca>
Date: Fri, 7 Jan 2022 06:33:46 -0800
Subject: [PATCH] Release 2.10.3 - See CHANGELOG.md

---
 CHANGELOG.md                                    |  6 ++++++
 install/etc/services.available/10-db-backup/run | 15 ++++-----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fca2b3..0ed7413 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.10.3 2022-01-07 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Change the way MariaD/MySQL connectivity check is performed to allow for better compatibility without requiring the DB_USER to have PROCESS privileges
+
+
 ## 2.10.2 2021-12-28 <dave at tiredofit dot ca>
 
    ### Changed
diff --git a/install/etc/services.available/10-db-backup/run b/install/etc/services.available/10-db-backup/run
index 07d6f76..7955207 100755
--- a/install/etc/services.available/10-db-backup/run
+++ b/install/etc/services.available/10-db-backup/run
@@ -296,17 +296,10 @@ check_availability() {
         "mysql" )
             COUNTER=0
             export MYSQL_PWD=${dbpass}
-            while true; do
-                mysqlcmd='mysql -u'${dbuser}' -P '${dbport}' -h '${dbhost}
-                out="$($mysqlcmd -e "SELECT COUNT(*) FROM information_schema.FILES;" 2>&1)"
-                echo "$out" | grep -E "COUNT|Enter" 2>&1 > /dev/null
-                if [ $? -eq 0 ]; then
-                    :
-                    break
-                fi
-                print_warn "MySQL/MariaDB Server '${dbhost}' is not accessible, retrying.. ($COUNTER seconds so far)"
-                sleep 5
-                (( COUNTER+=5 ))
+            while ! (mysql -u"${dbuser}" -P"${dbport}" -h"${dbhost}" -e "SHOW GRANTS FOR CURRENT_USER;" 2>&1 | grep -E "GRANT ALL PRIVILEGES ON \`${DB_NAME}\`" > /dev/null 2>&1) ; do
+              sleep 5
+              (( COUNTER+=5 ))
+              print_warn "MySQL/MariaDB Server '${maria_host}' is not accessible, retrying.. ($counter seconds so far)"
             done
         ;;
         "mssql" )