Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e405586584276957d930f8d93071713412accacf https://github.com/phpmyadmin/phpmyadmin/commit/e405586584276957d930f8d93071... Author: Michal Čihař michal@cihar.com Date: 2015-12-28 (Mon, 28 Dec 2015)

Changed paths: M ChangeLog M libraries/DatabaseInterface.class.php

Log Message: ----------- Avoid conversion of MySQL error messages

The messages are properly encoded based on connection collation. This seems to be the case since introduction of the collations, but the code has stayed in phpMyAdmin since the times before it.

Fixes #11788

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 58ba4b83b88144fcf1a29a0fb365a68f45a32048 https://github.com/phpmyadmin/phpmyadmin/commit/58ba4b83b88144fcf1a29a0fb365... Author: Michal Čihař michal@cihar.com Date: 2015-12-28 (Mon, 28 Dec 2015)

Changed paths: M ChangeLog M libraries/DatabaseInterface.php

Log Message: ----------- Merge branch 'QA_4_5'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/671a5f7b0c1d...58ba4b83b881