Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3c6675b3f9464acf5c8a3a8eb2449a481c199bcb https://github.com/phpmyadmin/phpmyadmin/commit/3c6675b3f9464acf5c8a3a8eb244... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-09 (Thu, 09 Jun 2016) Changed paths: M ChangeLog M libraries/ServerStatusData.php Log Message: ----------- Fix division by zero in case of misconfigured MySQL server Fixes #12308 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: cff938e15b54c1e61a2d701815032ead0ffe5902 https://github.com/phpmyadmin/phpmyadmin/commit/cff938e15b54c1e61a2d70181503... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-09 (Thu, 09 Jun 2016) Changed paths: M ChangeLog M libraries/ServerStatusData.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c70aed7a1d09...cff938e15b54