Branch: refs/heads/QA_4_4
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 4c0b0f9687cc03ac92bde7c92ed9b44dbae5ca92
      
https://github.com/phpmyadmin/phpmyadmin/commit/4c0b0f9687cc03ac92bde7c92ed9b44dbae5ca92
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

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

  Log Message:
  -----------
  bug #4821 Timed-out import fails to restart when file represented

Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>


  Commit: f6dd7c2cd41202ac6c7996f025b1b8488ebcb5b3
      
https://github.com/phpmyadmin/phpmyadmin/commit/f6dd7c2cd41202ac6c7996f025b1b8488ebcb5b3
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    M import.php
    M libraries/display_import.inc.php

  Log Message:
  -----------
  Pass local_import_file

Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>


  Commit: e3735f951c9f5392b75139d0f317aef7547372fa
      
https://github.com/phpmyadmin/phpmyadmin/commit/e3735f951c9f5392b75139d0f317aef7547372fa
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

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

  Log Message:
  -----------
  Merge pull request #1619 from madhuracj/bug4821

bug #4821 Timed-out import fails to restart when file represented


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/3b8c3ebeca2a...e3735f951c9f
------------------------------------------------------------------------------
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

Reply via email to