Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 97d0415687b757e1ffb2c79f69c1e36a8ee3d63b https://github.com/phpmyadmin/phpmyadmin/commit/97d0415687b757e1ffb2c79f69c1... Author: Martin Herndl <martin.herndl@world4you.com> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M libraries/plugins/import/ImportSql.class.php Log Message: ----------- Fixes #11386 Cannot import database with long data in one column Signed-off-by: Martin Herndl martin.herndl@world4you.com Commit: 85dc44b557eb8536fec5c93fcfe6507fa3b94276 https://github.com/phpmyadmin/phpmyadmin/commit/85dc44b557eb8536fec5c93fcfe6... Author: Marc Delisle <marc@infomarc.info> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: da05ed6316f10024ca83ff2bd56de32112bae545 https://github.com/phpmyadmin/phpmyadmin/commit/da05ed6316f10024ca83ff2bd56d... Author: Marc Delisle <marc@infomarc.info> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M ChangeLog M libraries/plugins/import/ImportSql.class.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/235995b8fc74...da05ed6316f1