Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 788c96e8c744c66619cde6fc887b666d581282e6 https://github.com/phpmyadmin/phpmyadmin/commit/788c96e8c744c66619cde6fc887b... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-08-31 (Mon, 31 Aug 2015) Changed paths: M ChangeLog M libraries/DatabaseInterface.class.php M libraries/Partition.class.php M libraries/Table.class.php M libraries/Util.class.php M libraries/controllers/TableSearchController.class.php M libraries/dbi/DBIDummy.class.php M libraries/mysql_charsets.lib.php M libraries/operations.lib.php M libraries/plugins/import/ImportLdi.class.php M libraries/server_privileges.lib.php M templates/database/structure/body_for_table_summary.phtml M test/classes/plugin/export/PMA_ExportSql_test.php Log Message: ----------- Fix #11442 MySQL 5.7 and SHOW VARIABLES Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: ca917746b6b0fa0952d3c622167c0164cd99aae1 https://github.com/phpmyadmin/phpmyadmin/commit/ca917746b6b0fa0952d3c622167c... Author: Marc Delisle <marc@infomarc.info> Date: 2015-08-31 (Mon, 31 Aug 2015) Changed paths: M ChangeLog M libraries/DatabaseInterface.class.php M libraries/Partition.class.php M libraries/Table.class.php M libraries/Util.class.php M libraries/controllers/TableSearchController.class.php M libraries/dbi/DBIDummy.class.php M libraries/mysql_charsets.lib.php M libraries/operations.lib.php M libraries/plugins/import/ImportLdi.class.php M libraries/server_privileges.lib.php M templates/database/structure/body_for_table_summary.phtml M test/classes/plugin/export/PMA_ExportSql_test.php Log Message: ----------- Merge pull request #11444 from madhuracj/show Fix #11442 MySQL 5.7 and SHOW VARIABLES Commit: 02adcde835d08503211ac534a42f7e6882708781 https://github.com/phpmyadmin/phpmyadmin/commit/02adcde835d08503211ac534a42f... Author: Marc Delisle <marc@infomarc.info> Date: 2015-08-31 (Mon, 31 Aug 2015) Changed paths: M ChangeLog M libraries/DatabaseInterface.class.php M libraries/Partition.class.php M libraries/Table.class.php M libraries/Util.class.php M libraries/controllers/TableSearchController.class.php M libraries/dbi/DBIDummy.class.php M libraries/mysql_charsets.lib.php M libraries/operations.lib.php M libraries/plugins/import/ImportLdi.class.php M libraries/server_privileges.lib.php M templates/database/structure/body_for_table_summary.phtml M test/classes/plugin/export/PMA_ExportSql_test.php Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b703e9a84c28...02adcde835d0