Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 081843aa5c0152c1c6ec8d0cb69f4041c8ea8683 https://github.com/phpmyadmin/phpmyadmin/commit/081843aa5c0152c1c6ec8d0cb69f... Author: Michal Čihař michal@cihar.com Date: 2016-12-05 (Mon, 05 Dec 2016)

Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.php

Log Message: ----------- Fixed SQL export with newlines

Remove manual escaping where we do proper escaping through MySQL extension.

Fixes #12765

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

Commit: ce2208635f5a1c69a90a871ea3ec7cdd96333022 https://github.com/phpmyadmin/phpmyadmin/commit/ce2208635f5a1c69a90a871ea3ec... Author: Isaac Bennetch bennetch@gmail.com Date: 2016-12-05 (Mon, 05 Dec 2016)

Changed paths: M README M doc/conf.py M libraries/Config.php

Log Message: ----------- Update for release 4.6.5.2

Signed-off-by: Isaac Bennetch bennetch@gmail.com

Commit: 5f36fa56c471a1fab3b3a12dcf10efc9fcff9c72 https://github.com/phpmyadmin/phpmyadmin/commit/5f36fa56c471a1fab3b3a12dcf10... Author: Michal Čihař michal@cihar.com Date: 2017-01-02 (Mon, 02 Jan 2017)

Log Message: ----------- Merge remote-tracking branch 'origin/MAINT_4_6_5' into QA_4_6

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d018add94b06...5f36fa56c471