update from 4.7.4 to 5.0: errors

this is a list of the errors I got upgrading a site from 4.7.4 to 5.0. (Now I've done two upgrades, both with somewhat different errors - whee!)

    * user warning: Table 'blocks_roles' already exists query: CREATE TABLE blocks_roles ( module varchar(64) NOT NULL, delta varchar(32) NOT NULL, rid int unsigned NOT NULL, PRIMARY KEY (module, delta, rid) ) /*!40100 DEFAULT CHARACTER SET utf8 */; in /var/www/includes/database.mysql.inc on line 167.
    * user warning: Table 'node_type_content' already exists query: RENAME TABLE node_type TO node_type_content in /var/www/includes/database.mysql.inc on line 167.
    * user warning: Table 'node_type' already exists query: CREATE TABLE node_type ( type varchar(32) NOT NULL, name varchar(255) NOT NULL, module varchar(255) NOT NULL, description mediumtext NOT NULL, help mediumtext NOT NULL, has_title tinyint unsigned NOT NULL, title_label varchar(255) NOT NULL default '', has_body tinyint unsigned NOT NULL, body_label varchar(255) NOT NULL default '', min_word_count smallint unsigned NOT NULL, custom tinyint NOT NULL DEFAULT '0', modified tinyint NOT NULL DEFAULT '0', locked tinyint NOT NULL DEFAULT '0', orig_type varchar(255) NOT NULL default '', PRIMARY KEY (type) ) /*!40100 DEFAULT CHARACTER SET utf8 */; in /var/www/includes/database.mysql.inc on line 167.

the blocks_roles table has the proper structure already.

the node_type table seems to have the proper structure this time. Last time it was wrong.

node_type contains entries for page and story. I assume this is what's missing from my other database, causing me to have to create custom types for page and story.