[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 2dcb1c: Fix #4645 Import of export created with mysqldump
Marc Delisle
marc at infomarc.info
Wed Dec 24 12:41:25 CET 2014
Branch: refs/heads/QA_4_3
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 2dcb1c9b0a9c6603a3bb39fb49f568a2c8d9b5cd
https://github.com/phpmyadmin/phpmyadmin/commit/2dcb1c9b0a9c6603a3bb39fb49f568a2c8d9b5cd
Author: Hugues Peccatte <hugues.peccatte at gmail.com>
Date: 2014-12-21 (Sun, 21 Dec 2014)
Changed paths:
M ChangeLog
M libraries/plugins/import/ImportSql.class.php
Log Message:
-----------
Fix #4645 Import of export created with mysqldump
Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>
Commit: 647078cab3bcf357de6a4cece675d219b78cab12
https://github.com/phpmyadmin/phpmyadmin/commit/647078cab3bcf357de6a4cece675d219b78cab12
Author: Hugues Peccatte <hugues.peccatte at gmail.com>
Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Update ChangeLog.
Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>
Commit: 77fec70ee87ccbd456df04c7d554bc8993345d95
https://github.com/phpmyadmin/phpmyadmin/commit/77fec70ee87ccbd456df04c7d554bc8993345d95
Author: Marc Delisle <marc at infomarc.info>
Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths:
M ChangeLog
M libraries/plugins/import/ImportSql.class.php
Log Message:
-----------
Fix merge conflict
Signed-off-by: Marc Delisle <marc at infomarc.info>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/296a87c83dd3...77fec70ee87c
More information about the Git
mailing list