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

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 915f209ca1aacac0ca0b1cc8490362941e7e26bf https://github.com/phpmyadmin/phpmyadmin/commit/915f209ca1aacac0ca0b1cc8490… Author: RAKESH KUMAR <rakeshkumar4294(a)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(a)gmail.com> Commit: 5c8ed0e35ea2b26d941478230ca7b300b387ccd1 https://github.com/phpmyadmin/phpmyadmin/commit/5c8ed0e35ea2b26d941478230ca… Author: Marc Delisle <marc(a)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 Commit: 4e5866a8a6e6275325f0e8a5874a5ab374df99ae https://github.com/phpmyadmin/phpmyadmin/commit/4e5866a8a6e6275325f0e8a5874… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-01-20 (Tue, 20 Jan 2015) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 535db88e47c7a21c97bf21e96b8c61bcbcbf464c https://github.com/phpmyadmin/phpmyadmin/commit/535db88e47c7a21c97bf21e96b8… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-01-20 (Tue, 20 Jan 2015) Changed paths: M ChangeLog M import.php M libraries/sql.lib.php Log Message: ----------- Merge branch 'QA_4_3' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ac6859149f7b...535db88e47c7