From 20a508358bd4102bad0ae53299b453e0f39ee5b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Sun, 17 Jan 2016 18:35:42 +0100 Subject: [PATCH 1/2] Fix comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- user_password.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_password.php b/user_password.php index 93149947bb..ddde5e9be0 100644 --- a/user_password.php +++ b/user_password.php @@ -210,7 +210,7 @@ function PMA_changePassHashingFunction() } /** - * Generate the error url and submit the query + * Changes password for a user * * @param string $username Username * @param string $hostname Hostname From bfaa77ef21ab04b63d165f78d84f6b8bb716c8d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Sun, 17 Jan 2016 18:43:32 +0100 Subject: [PATCH 2/2] Fix password change on MariaDB 10.1 and newer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use SET PASSWORD which seems again do the correct thing there. Fixes #11855 Signed-off-by: Michal Čihař --- ChangeLog | 1 + user_password.php | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index f3057ab388..9419c1f3eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.5.5.0 (not yet released) - issue Undefined index: is_ajax_request +- issue #11855 Fix password change on MariaDB 10.1 and newer 4.5.4.0 (not yet released) - issue #11724 live data edit of big sets is not working diff --git a/user_password.php b/user_password.php index ddde5e9be0..30940f4cbf 100644 --- a/user_password.php +++ b/user_password.php @@ -235,6 +235,7 @@ function PMA_changePassUrlParamsAndSubmitQuery( : '\'' . PMA_Util::sqlAddSlashes($password) . '\''); } else if ($serverType == 'MariaDB' && PMA_MYSQL_INT_VERSION >= 50200 + && PMA_MYSQL_INT_VERSION < 100100 ) { if ($orig_auth_plugin == 'mysql_native_password') { // Set the hashing method used by PASSWORD()