From 33f1b66d8defa00ef0af5d440152b8b2afa2f56e Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Sun, 25 Aug 2019 21:33:14 -0700
Subject: [PATCH] MariaDB 10.x still uses password()

---
 mysql/save_user.cgi | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mysql/save_user.cgi b/mysql/save_user.cgi
index 4e258ad8f..201f18eb1 100755
--- a/mysql/save_user.cgi
+++ b/mysql/save_user.cgi
@@ -63,9 +63,7 @@ else {
 	if ($in{'mysqlpass_mode'} == 0) {
 		$esc = &escapestr($in{'mysqlpass'});
 		if ($variant eq "mysql" &&
-		      &compare_version_numbers($ver, "8") >= 0 ||
-		    $variant eq "mariadb" &&
-		      &compare_version_numbers($ver, "10.2") >= 0) {
+		    &compare_version_numbers($ver, "8") >= 0) {
 			&execute_sql_logged($master_db,
 				"set password for '".$user."'\@'".$host."' = ".
 				"'$esc'");