Problem solved. The block table in the database was corrupt. When I repaired it, the upgrade continued through to the end.
Installing and upgrading help
Problem with setting up block tables
This discussion has been locked so you can no longer reply to it.