Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e85eddb01f4ddf4c5525db7152d796995555721b https://github.com/phpmyadmin/phpmyadmin/commit/e85eddb01f4ddf4c5525db7152d7... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-09-13 (Sat, 13 Sep 2014)

Changed paths: M ChangeLog M libraries/String.class.php M libraries/StringByte.int.php M libraries/StringMB.class.php M libraries/StringNative.class.php M libraries/plugins/import/ImportSql.class.php

Log Message: ----------- Fix #4528 Can't import dump via SQL field

Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com

Commit: 6a038d5f90cfe682c9554fa543dcd3b240239870 https://github.com/phpmyadmin/phpmyadmin/commit/6a038d5f90cfe682c9554fa543dc... Author: Marc Delisle marc@infomarc.info Date: 2014-09-14 (Sun, 14 Sep 2014)

Changed paths: M ChangeLog M libraries/String.class.php M libraries/StringByte.int.php M libraries/StringMB.class.php M libraries/StringNative.class.php M libraries/plugins/import/ImportSql.class.php

Log Message: ----------- Merge pull request #1356 from Tithugues/b4528_master

Fix #4528 Can't import dump via SQL field

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d978643fc28b...6a038d5f90cf