diff options
| author | Michal Čihař <michal@cihar.com> | 2016-08-02 09:34:42 +0300 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2016-08-02 09:34:42 +0300 |
| commit | afcec9d9d7fc9ba29db56b7b5f6e2692ce518e79 (patch) | |
| tree | de22e5b2a75f0cfef6f54a0626e7b7d7a57e91b3 /user_password.php | |
| parent | aeb0cbabd61b08f866760c1b8c065323bc47dca1 (diff) | |
| parent | cdcf74ab0bde94d9be5aa29169b2c8ed8141103d (diff) | |
Merge branch 'QA_4_6'
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 8f442ab0b5..38c3dd5fc0 100644 --- a/user_password.php +++ b/user_password.php @@ -236,6 +236,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() |