From d604a3613523d09c30ddcef6c700c67b0a317899 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Wed, 28 Oct 2015 22:18:38 +0530 Subject: [PATCH] Fix issue 11605 Signed-off-by: Deven Bansod --- libraries/server_privileges.lib.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 3bc697191a..1b6aee3d1b 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -3952,10 +3952,18 @@ function PMA_getDataForChangeOrCopyUser() if (PMA_Util::getServerType() == 'MySQL' && PMA_MYSQL_INT_VERSION >= 50606 && PMA_MYSQL_INT_VERSION < 50706 - && isset($password) + && ((isset($authentication_string) + && empty($password)) + || (isset($plugin) + && $plugin == 'sha256_password')) + ) { + $password = $authentication_string; + } + + if (PMA_Util::getServerType() == 'MariaDB' + && PMA_MYSQL_INT_VERSION >= 50500 + && isset($authentication_string) && empty($password) - && isset($plugin) - && $plugin == 'sha256_password' ) { $password = $authentication_string; }