Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 855145988ca9f92bea97c6568212c0b4da1b61c4
      
https://github.com/phpmyadmin/phpmyadmin/commit/855145988ca9f92bea97c6568212c0b4da1b61c4
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M libraries/import.lib.php

  Log Message:
  -----------
  Revert "Always use local static storage of executed queries"

This reverts commit ee8f9b0dba8afd6fd736a0bf8601c3e5cd3b9e49.


  Commit: 5563f3e137d5dbdb22346294ddefd0d5005eaf92
      
https://github.com/phpmyadmin/phpmyadmin/commit/5563f3e137d5dbdb22346294ddefd0d5005eaf92
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

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

  Log Message:
  -----------
  Revert "Remove sql data parameter"

This reverts commit 84c12c2fddc52374a6358cbe4a8140675b553b7f.


  Commit: dd09116716cc6eb37e314f4b9f0eefac9e1c769e
      
https://github.com/phpmyadmin/phpmyadmin/commit/dd09116716cc6eb37e314f4b9f0eefac9e1c769e
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M libraries/import.lib.php
    M libraries/plugins/import/ImportCsv.php
    M libraries/plugins/import/ImportLdi.php
    M libraries/plugins/import/ImportMediawiki.php
    M libraries/plugins/import/ImportOds.php
    M libraries/plugins/import/ImportShp.php
    M libraries/plugins/import/ImportXml.php
    M libraries/plugins/import/README

  Log Message:
  -----------
  Correct fix for table import processing

We need to consistently propagate the $sql_data array.

Issue #11850

Signed-off-by: Michal Čihař <mic...@cihar.com>


  Commit: 8bf212f6c321168e8deb050d8dec6e9a2a9a4810
      
https://github.com/phpmyadmin/phpmyadmin/commit/8bf212f6c321168e8deb050d8dec6e9a2a9a4810
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M import.php

  Log Message:
  -----------
  Avoid displaying import query twice

Fixes #11907

Signed-off-by: Michal Čihař <mic...@cihar.com>


  Commit: f1379e2b26e89c63c6b663b9dc2fc62d80882898
      
https://github.com/phpmyadmin/phpmyadmin/commit/f1379e2b26e89c63c6b663b9dc2fc62d80882898
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M import.php
    M libraries/import.lib.php
    M libraries/plugins/import/ImportCsv.php
    M libraries/plugins/import/ImportLdi.php
    M libraries/plugins/import/ImportMediawiki.php
    M libraries/plugins/import/ImportOds.php
    M libraries/plugins/import/ImportShp.php
    M libraries/plugins/import/ImportSql.php
    M libraries/plugins/import/ImportXml.php
    M libraries/plugins/import/README

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


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/2670a1499fca...f1379e2b26e8
_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

Reply via email to