[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 2dcb1c: Fix #4645 Import of export created with mysqldump

2014-12-24 Thread Marc Delisle
  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.pecca...@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.pecca...@gmail.com


  Commit: 647078cab3bcf357de6a4cece675d219b78cab12
  
https://github.com/phpmyadmin/phpmyadmin/commit/647078cab3bcf357de6a4cece675d219b78cab12
  Author: Hugues Peccatte hugues.pecca...@gmail.com
  Date:   2014-12-23 (Tue, 23 Dec 2014)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Update ChangeLog.

Signed-off-by: Hugues Peccatte hugues.pecca...@gmail.com


  Commit: 77fec70ee87ccbd456df04c7d554bc8993345d95
  
https://github.com/phpmyadmin/phpmyadmin/commit/77fec70ee87ccbd456df04c7d554bc8993345d95
  Author: Marc Delisle m...@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 m...@infomarc.info


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/296a87c83dd3...77fec70ee87c--
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net___
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git


[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 2dcb1c: Fix #4645 Import of export created with mysqldump

2014-12-24 Thread Marc Delisle
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 2dcb1c9b0a9c6603a3bb39fb49f568a2c8d9b5cd
  
https://github.com/phpmyadmin/phpmyadmin/commit/2dcb1c9b0a9c6603a3bb39fb49f568a2c8d9b5cd
  Author: Hugues Peccatte hugues.pecca...@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.pecca...@gmail.com


  Commit: 647078cab3bcf357de6a4cece675d219b78cab12
  
https://github.com/phpmyadmin/phpmyadmin/commit/647078cab3bcf357de6a4cece675d219b78cab12
  Author: Hugues Peccatte hugues.pecca...@gmail.com
  Date:   2014-12-23 (Tue, 23 Dec 2014)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Update ChangeLog.

Signed-off-by: Hugues Peccatte hugues.pecca...@gmail.com


  Commit: 77fec70ee87ccbd456df04c7d554bc8993345d95
  
https://github.com/phpmyadmin/phpmyadmin/commit/77fec70ee87ccbd456df04c7d554bc8993345d95
  Author: Marc Delisle m...@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 m...@infomarc.info


  Commit: 1c1c313d768b7b882c68d7e30f5a55b1a951fffa
  
https://github.com/phpmyadmin/phpmyadmin/commit/1c1c313d768b7b882c68d7e30f5a55b1a951fffa
  Author: Marc Delisle m...@infomarc.info
  Date:   2014-12-24 (Wed, 24 Dec 2014)

  Changed paths:
M ChangeLog
M libraries/plugins/import/ImportSql.class.php

  Log Message:
  ---
  Merge branch 'QA_4_3'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/e56f197c3dd7...1c1c313d768b--
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net___
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git