Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4fd270965082ae17c3ac027dcbb5926244b03c9e https://github.com/phpmyadmin/phpmyadmin/commit/4fd270965082ae17c3ac027dcbb5... Author: Michal Čihař michal@cihar.com Date: 2016-06-06 (Mon, 06 Jun 2016)
Changed paths: M ChangeLog M libraries/Error.php M test/classes/ErrorTest.php
Log Message: ----------- Avoid rewriting PHP stack frames
Surprisingly PHP stack frames are passed as references to the error handling code, thus changing value there leads to changing value in the executed code.
With MySQL issuing warning about incompatible version (different runtime library than compile time), handling this warning rewrites current stack frame and the mysql_real_connect later sees parameters as processed by Error class for display.
We now create copy of the stacktrace to avoid this.
Fixes #12279
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 7a6632075336c8ca15e41094d63650442f8fe9d6 https://github.com/phpmyadmin/phpmyadmin/commit/7a6632075336c8ca15e41094d636... Author: Michal Čihař michal@cihar.com Date: 2016-06-06 (Mon, 06 Jun 2016)
Changed paths: M ChangeLog M libraries/Error.php M test/classes/ErrorTest.php
Log Message: ----------- Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5bc426742dce...7a6632075336