Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 76f51a1ffbbf430354715822521caaf9f4caa815 https://github.com/phpmyadmin/phpmyadmin/commit/76f51a1ffbbf430354715822521c... Author: Michal Čihař <michal@cihar.com> Date: 2017-08-21 (Mon, 21 Aug 2017) Changed paths: M libraries/plugins/export/ExportSql.php Log Message: ----------- Use tryQuery instead of query to handle errors We really do not want to end up in mysql_die here as we could have sent some output already. Fixes #13600 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 3c79eb6cdbc88d64a91f8be621bb69f27c4b4c5f https://github.com/phpmyadmin/phpmyadmin/commit/3c79eb6cdbc88d64a91f8be621bb... Author: Michal Čihař <michal@cihar.com> Date: 2017-08-21 (Mon, 21 Aug 2017) Changed paths: M libraries/Error.php Log Message: ----------- Better handle situation where debug_backtrace is disabled Fixes #13599 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 87ec560346bcf66744fc56e28ddc249d0fd4d0cb https://github.com/phpmyadmin/phpmyadmin/commit/87ec560346bcf66744fc56e28ddc... Author: Michal Čihař <michal@cihar.com> Date: 2017-08-21 (Mon, 21 Aug 2017) Changed paths: M libraries/classes/Error.php M libraries/classes/Plugins/Export/ExportSql.php Log Message: ----------- Merge branch 'QA_4_7' Commit: 02f819558182b392e647d65865372762904c30aa https://github.com/phpmyadmin/phpmyadmin/commit/02f819558182b392e647d6586537... Author: Michal Čihař <michal@cihar.com> Date: 2017-08-21 (Mon, 21 Aug 2017) Changed paths: M templates/columns_definitions/column_default.phtml M test/selenium/PmaSeleniumCreateRemoveUserTest.php M test/selenium/PmaSeleniumDbEventsTest.php M test/selenium/PmaSeleniumTableBrowseTest.php M test/selenium/PmaSeleniumTableStructureTest.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/dac19fbe7e6c...02f819558182