MySQL InnoDB import fails occasionaly with deadlocks

I recently changed the MySQL tests InnoDB like we tell our customers to do. These tests then started deadlocking on the restore. Its not 100% reliable but it has happend at least twice on different batches since I made the change. We need to work out if this is a real bug, or configuration error or something else.

Import is multi-threads and we may have multiple threads writing to the one table. This could cause deadlocks on lock escalation.