diff options
| author | Michal Čihař <michal@cihar.com> | 2016-08-02 09:33:39 +0300 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2016-08-02 09:33:39 +0300 |
| commit | ef9bd20e7a1b793bf9a64b04b3c5a9e332bb80df (patch) | |
| tree | bf91a7ffbab9fe96713f66a7a750fb58a85df98f /user_password.php | |
| parent | d621855169f7ac97c1250c7982be8c160ae056ef (diff) | |
| parent | cdcf74ab0bde94d9be5aa29169b2c8ed8141103d (diff) | |
Merge branch 'QA_4_6' into QA_4_6-security
Diffstat (limited to 'user_password.php')
| -rw-r--r-- | user_password.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/user_password.php b/user_password.php index a68f3a8e4e..79060293ce 100644 --- a/user_password.php +++ b/user_password.php @@ -240,6 +240,7 @@ function PMA_changePassUrlParamsAndSubmitQuery( } else if ($serverType == 'MariaDB' && PMA_MYSQL_INT_VERSION >= 50200 && PMA_MYSQL_INT_VERSION < 100100 + && $orig_auth_plugin !== '' ) { if ($orig_auth_plugin == 'mysql_native_password') { // Set the hashing method used by PASSWORD() |