Fix #4645 Import of export created with mysqldump

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Update ChangeLog.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge branch 'QA_4_3'