Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b49030528fc68bc416bc7c4471c7600dc18af881 https://github.com/phpmyadmin/phpmyadmin/commit/b49030528fc68bc416bc7c4471c7... Author: Michal Čihař michal@cihar.com Date: 2016-06-03 (Fri, 03 Jun 2016)

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

Log Message: ----------- Fixed export of tables without explicitly set engine

Fixes #12290

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

Commit: 8a494f26d2ff7cd5d19787c3836da525b3b6457b https://github.com/phpmyadmin/phpmyadmin/commit/8a494f26d2ff7cd5d19787c3836d... Author: Michal Čihař michal@cihar.com Date: 2016-06-03 (Fri, 03 Jun 2016)

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

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e9614da53a18...8a494f26d2ff