[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d1bb02: Fix bug#4948

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d1bb02603436e1ad056582298fc7ee14156f62f6
      https://github.com/phpmyadmin/phpmyadmin/commit/d1bb02603436e1ad056582298fc7ee14156f62f6
  Author: Nisarg Jhaveri <nisargjhaveri at gmail.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M libraries/import.lib.php
    M libraries/sql.lib.php

  Log Message:
  -----------
  Fix bug#4948

Signed-off-by: Nisarg Jhaveri <nisargjhaveri at gmail.com>


  Commit: 66a8288c77f470afbef7347ed077b0fb6b3e55bd
      https://github.com/phpmyadmin/phpmyadmin/commit/66a8288c77f470afbef7347ed077b0fb6b3e55bd
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M libraries/import.lib.php
    M libraries/sql.lib.php

  Log Message:
  -----------
  Merge pull request #1724 from nisargjhaveri/issue_4948

Fix bug#4948


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/44b00e20079b...66a8288c77f4