[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 915f20: BugFix#4714

[Marc Delisle]

  Branch: refs/heads/QA_4_3
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 915f209ca1aacac0ca0b1cc8490362941e7e26bf
      https://github.com/phpmyadmin/phpmyadmin/commit/915f209ca1aacac0ca0b1cc8490362941e7e26bf
  Author: RAKESH KUMAR <rakeshkumar4294 at gmail.com>
  Date:   2015-01-20 (Tue, 20 Jan 2015)

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

  Log Message:
  -----------
  BugFix#4714

Signed-off-by: RAKESH KUMAR <rakeshkumar4294 at gmail.com>


  Commit: 5c8ed0e35ea2b26d941478230ca7b300b387ccd1
      https://github.com/phpmyadmin/phpmyadmin/commit/5c8ed0e35ea2b26d941478230ca7b300b387ccd1
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-01-20 (Tue, 20 Jan 2015)

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

  Log Message:
  -----------
  Merge pull request #1463 from rakeshkaundilya/QA_4_3

BugFix#4714


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8bc1de7c8d79...5c8ed0e35ea2