From 8f211002ffe2a9e3d6f889797979945e0e73b622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kov=C3=A1cs=20Zolt=C3=A1n?= <kovacsz@marcusconsulting.hu>
Date: Mon, 1 Sep 2025 13:03:22 +0200
Subject: [PATCH] In mysql_restoredb the decimal conversion has been forced in
 MySQL/MariaDB version comparison.

---
 .metadata                      | Bin 15851 -> 15851 bytes
 .templates/bin/mysql_restoredb |   8 +++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.metadata b/.metadata
index b3b084de86f72487c91a29d84dba5e2b31f05028..1b8c701465f3ba6e14cd20f264fd6be83e6ddd98 100644
GIT binary patch
delta 85
zcmaD|{knQXGaJv{@~s&RKu{BWMPu?rG11BA4OBOuWOI?=`CbE&@j2TkJvop=bn*fn
Z!OiyaHvFhEikhO6_w!3{-mYiD4*+Wx9s~dY

delta 73
zcmaD|{knQXGaHZTq38?-AkZ(U;ha2COmy;j1J%tZ*<2)8GIWloPxe>V+iWjy!_RY}
ad@ESp9Kk<olNB{ZC-3K%-n?DUgdYIDw-~Vi

diff --git a/.templates/bin/mysql_restoredb b/.templates/bin/mysql_restoredb
index 19e8ae1..d3488a3 100755
--- a/.templates/bin/mysql_restoredb
+++ b/.templates/bin/mysql_restoredb
@@ -24,6 +24,8 @@
 # Author: Kovács Zoltán <kovacsz@marcusconsulting.hu>
 #         Kovács Zoltán <kovacs.zoltan@smartfront.hu>
 # License: GNU/GPL v3+ (https://www.gnu.org/licenses/gpl-3.0.en.html)
+# 2025-09-01 v1.2
+# fix: Decimal conversion has been forced in MySQL/MariaDB version comparison.
 # 2025-03-04 v1.1
 # new: Works with dockerized databases but hasn't yet been tested with natives.
 # mod: Database user creation and grants rewritten. Now create user @'%'
@@ -65,8 +67,8 @@ PATH="$PATH:/usr/local/sbin:/usr/sbin:/sbin"; fi
 # Other initialisations.
 #
 LOGSTAMP="\"\$DATE\" +%Y-%m-%d\ %H:%M:%S"	# Timestamp format for logs
-MARIADBMIN="010001003"				# MariaDB minimum version
-MYSQLMIN="005007006"				# MySQL minimum version
+MARIADBMIN="10#010001003"			# MariaDB minimum version
+MYSQLMIN="10#005007006"				# MySQL minimum version
 vetodatabases="information_schema mysql performance_schema sys"
 
 # Messages.
@@ -416,7 +418,7 @@ if $ISDBA; then
     # Let's extract a comparable RDBMS version from the result.
     dbversion=${result%%-*}		# strips anyone after 1st dash (including)
     dbversion=(${dbversion//./ })	# converts to an array
-    dbversion=$("$PRINTF" '%03d%03d%03d' ${dbversion[@]}) # 3 times 3 digits 0-padded
+    dbversion=$("$PRINTF" '10#%03d%03d%03d' ${dbversion[@]}) # 3 times 3 digits 0-padded decimal
     if [ -n "$(echo "$result" | "$GREP" -i "mariadb")" ]; then
 	# MariaDB version check.
         (( dbversion < MARIADBMIN )) \