Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2e448d46e3293e35b2d93b1862e9523182594c44 https://github.com/phpmyadmin/phpmyadmin/commit/2e448d46e3293e35b2d93b1862e9... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-21 (Tue, 21 Mar 2017) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: ----------- Fixed setting password on recent MariaDB with non working plugins When the plugins are not working (eg. the plugins directory does not exist), we should still allow to change the password. Fixes #12757 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: ff90f20054dc093771f8daf85b77d22673f6ab63 https://github.com/phpmyadmin/phpmyadmin/commit/ff90f20054dc093771f8daf85b77... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-21 (Tue, 21 Mar 2017) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7c35333e5d49...ff90f20054dc