diff options
| author | Michal Čihař <michal@cihar.com> | 2016-08-02 09:45:23 +0300 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2016-08-02 09:45:23 +0300 |
| commit | 1cd7b757bf9b930aa211c3735d161e344fe380f6 (patch) | |
| tree | dba3d4e316df2504b3b60c7107153e5ff770145d /user_password.php | |
| parent | a8e3e662ada9467a382c734f2ac307cb8c8f0418 (diff) | |
| parent | f67d0e918ed41dc9c10177548c807f8d45d1c99d (diff) | |
Merge branch 'master' into master-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 8c5bde7ca4..0afe22d348 100644 --- a/user_password.php +++ b/user_password.php @@ -239,6 +239,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() |