Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: eeb016bf4df26f6927c1dd233b94f62d94c0e398 https://github.com/phpmyadmin/phpmyadmin/commit/eeb016bf4df26f6927c1dd233b94... Author: Michael Zarubin <mzarubin@plesk.com> Date: 2016-12-03 (Sat, 03 Dec 2016) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Fix #12757 SQL syntax errror on MariaDB < 10.0.2 in check for mysql password check plugin Signed-off-by: Michael Zarubin <mzarubin@gmail.com> Commit: 4f29bbd76ae8cb76c8fe1932ae642a5cea48ba38 https://github.com/phpmyadmin/phpmyadmin/commit/4f29bbd76ae8cb76c8fe1932ae64... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-03 (Sat, 03 Dec 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12757 and #12777 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 8b9a00d80faf3ff6a150004c3122cb6fedf3d806 https://github.com/phpmyadmin/phpmyadmin/commit/8b9a00d80faf3ff6a150004c3122... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-03 (Sat, 03 Dec 2016) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c1e073bd1cbd...8b9a00d80faf