Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: fa1d452e03a7522fbcf37b9649bd5b7421367c4c https://github.com/phpmyadmin/phpmyadmin/commit/fa1d452e03a7522fbcf37b9649bd... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-18 (Mon, 18 Apr 2016) Changed paths: M libraries/dbi/DBIMysqli.php Log Message: ----------- Do not hide errors from database connection attempts Without these errors it's impossible to figure out what went wrong in the SSL negotiation. All you get is error 2002 without any means to diagnose and all important information is issued as PHP warnings. Issue #12146 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: ea428dc86002261bff653067cbf28dd6da895144 https://github.com/phpmyadmin/phpmyadmin/commit/ea428dc86002261bff653067cbf2... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-18 (Mon, 18 Apr 2016) Changed paths: M test/classes/ErrorHandlerTest.php Log Message: ----------- Make ErrorHandler test more complete Actually test handling of stored errors. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 951f1fed5f2123ad7e10f8d2b0779d5ec7cb8a74 https://github.com/phpmyadmin/phpmyadmin/commit/951f1fed5f2123ad7e10f8d2b077... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-18 (Mon, 18 Apr 2016) Changed paths: M libraries/ErrorHandler.php M test/classes/ErrorHandlerTest.php Log Message: ----------- Add method to slice errors from the handler This can be useful to pop n-last errors. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: cfbc31bfa62ea3841f766146adc06fecdfd38f4b https://github.com/phpmyadmin/phpmyadmin/commit/cfbc31bfa62ea3841f766146adc0... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-18 (Mon, 18 Apr 2016) Changed paths: M libraries/DatabaseInterface.php Log Message: ----------- Better reporting of connection errors We really do not care about traceback or parameters in this case, all we need is to display the message coming from PHP. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 9e2ae0c6acf369ad9dfd8eea8ca32fc849ad1e37 https://github.com/phpmyadmin/phpmyadmin/commit/9e2ae0c6acf369ad9dfd8eea8ca3... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-18 (Mon, 18 Apr 2016) Changed paths: M libraries/DatabaseInterface.php M libraries/ErrorHandler.php M libraries/dbi/DBIMysqli.php M test/classes/ErrorHandlerTest.php Log Message: ----------- Merge pull request #12193 from nijel/connect-error Do not hide errors from database connection attempts Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b204a2daa559...9e2ae0c6acf3