From a76125769f28dfa975fb35cd4a4ff5403eafa0e9 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Mon, 4 Jan 2021 20:28:50 -0800
Subject: [PATCH] Use cached DB type when performing mysql -> mariadb string
 replacement

---
 mysql/mysql-lib.pl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mysql/mysql-lib.pl b/mysql/mysql-lib.pl
index e6a3e5c88..951d4cf58 100755
--- a/mysql/mysql-lib.pl
+++ b/mysql/mysql-lib.pl
@@ -76,9 +76,11 @@ use DBI;
 EOF
 }
 
-my ($rver, $rvariant) = &get_remote_mysql_variant();
-if ($rvariant ne 'mysql') {
-	$text = map { $text{$_} =~ s/MySQL/MariaDB/g } %text;
+# Fix text if we're running MariaDB
+if ($mysql_version =~ /mariadb/i) {
+	foreach my $t (keys %text) {
+		$text{$t} =~ s/MySQL/MariaDB/g;
+		}
 	}
 
 if (&compare_version_numbers($mysql_version, "5.5") >= 0) {