Drop the columns from the node_types table, that were supposed to be

done in revision 4.74 above.

sql/database-create.sql

@@ -1650,26 +1650,8 @@ CREATE TABLE node_type_features (
 CREATE TABLE node_types (
   class varchar(30) default NULL,
   type varchar(30) NOT NULL default '',
-  proc varchar(30) default NULL,
-  speed smallint(5) unsigned default NULL,
-  RAM smallint(5) unsigned default NULL,
-  HD float(10,2) default NULL,
-  max_interfaces tinyint(3) unsigned default '0',
-  osid varchar(35) NOT NULL default '',
-  control_net tinyint(3) unsigned default NULL,
-  power_time smallint(5) unsigned NOT NULL default '60',
-  imageid varchar(45) NOT NULL default '',
-  imageable tinyint(4) default '0',
-  delay_capacity tinyint(4) NOT NULL default '0',
-  virtnode_capacity tinyint(4) NOT NULL default '0',
-  control_iface text,
-  disktype enum('ad','da','ar','amrd') default NULL,
-  bootdisk_unit tinyint(3) unsigned NOT NULL default '0',
-  delay_osid varchar(35) default NULL,
-  jail_osid varchar(35) default NULL,
   modelnetcore_osid varchar(35) default NULL,
   modelnetedge_osid varchar(35) default NULL,
-  pxe_boot_path text,
   isvirtnode tinyint(4) NOT NULL default '0',
   ismodelnet tinyint(1) NOT NULL default '0',
   isjailed tinyint(1) NOT NULL default '0',
@@ -1679,12 +1661,6 @@ CREATE TABLE node_types (
   isplabdslice tinyint(4) NOT NULL default '0',
   isplabphysnode tinyint(4) NOT NULL default '0',
   issimnode tinyint(4) NOT NULL default '0',
-  simnode_capacity smallint(5) unsigned NOT NULL default '0',
-  trivlink_maxspeed int(11) unsigned NOT NULL default '0',
-  isrebootable tinyint(1) default '1',
-  bios_waittime int(10) unsigned default NULL,
-  adminmfs_osid varchar(35) default 'FREEBSD-MFS',
-  diskloadmfs_osid varchar(35) default 'FRISBEE-MFS',
   PRIMARY KEY  (type)
 ) TYPE=MyISAM;
 

sql/database-migrate.txt

@@ -3758,3 +3758,5 @@ last_net_act,last_cpu_act,last_ext_act);
       alter table experiment_template_instances add \
              description tinytext after uid;
 
+4.98: Drop the columns from the node_types table, that were supposed
+      to be done in revision 4.74 above. Skip to next revision ...