Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4330110c9023aacf1bc5cd4dee7f672ca475f96e https://github.com/phpmyadmin/phpmyadmin/commit/4330110c9023aacf1bc5cd4dee7f... Author: Hugues Peccatte <hugues.peccatte@gmail.com> Date: 2015-01-03 (Sat, 03 Jan 2015) Changed paths: M libraries/plugins/import/ImportSql.class.php Log Message: ----------- Revert "Fix #4645 Import of export created with mysqldump" This reverts commit 2dcb1c9b0a9c6603a3bb39fb49f568a2c8d9b5cd. Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com> Commit: 561ec7ea30b6a38ca166c41c0a1adee427d3e253 https://github.com/phpmyadmin/phpmyadmin/commit/561ec7ea30b6a38ca166c41c0a1a... Author: Hugues Peccatte <hugues.peccatte@gmail.com> Date: 2015-01-03 (Sat, 03 Jan 2015) Changed paths: M libraries/plugins/import/ImportSql.class.php Log Message: ----------- Remove code to ignore commit. Fix comment. Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com> Commit: fc6be4a7bd9e00e05846cc4abf9f864a10d081b7 https://github.com/phpmyadmin/phpmyadmin/commit/fc6be4a7bd9e00e05846cc4abf9f... Author: Hugues Peccatte <hugues.peccatte@gmail.com> Date: 2015-01-03 (Sat, 03 Jan 2015) Changed paths: M ChangeLog Log Message: ----------- Update ChangeLog. Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com> Commit: c99765a0984aac7b1f49eb32886afc5b934cb35b https://github.com/phpmyadmin/phpmyadmin/commit/c99765a0984aac7b1f49eb32886a... Author: Marc Delisle <marc@infomarc.info> Date: 2015-01-04 (Sun, 04 Jan 2015) Changed paths: M ChangeLog M libraries/plugins/import/ImportSql.class.php Log Message: ----------- Merge pull request #1446 from Tithugues/b4645_2_qa43 Fix #4645 and #4682 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a29ee3897a40...c99765a0984a