From ffd2a9551923ff4e27936482e1c09e3b8b7bcf41 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 28 Oct 2015 10:28:41 -0400 Subject: [PATCH] Fix failing test Signed-off-by: Marc Delisle --- libraries/server_privileges.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index b581f5d27a..52fc19e4e3 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -4003,7 +4003,7 @@ function PMA_getDataForChangeOrCopyUser() $password = $authentication_string; } - if (PMA_Util::getServerType() == 'MariaDB' + if (Util::getServerType() == 'MariaDB' && PMA_MYSQL_INT_VERSION >= 50500 && isset($authentication_string) && empty($password)