--- prod.txt	2009-02-25 19:17:55.000000000 +0100
+++ test.txt	2009-02-25 19:17:56.000000000 +0100
@@ -105,46 +105,32 @@
 
 CREATE TABLE auditlog (
   auditid bigint(20) unsigned NOT NULL default '0',
   userid bigint(20) unsigned NOT NULL default '0',
   clock int(11) NOT NULL default '0',
   `action` int(11) NOT NULL default '0',
   resourcetype int(11) NOT NULL default '0',
   details varchar(128) NOT NULL default '0',
   PRIMARY KEY  (auditid),
   KEY auditlog_1 (userid,clock),
   KEY auditlog_2 (clock)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 -- --------------------------------------------------------
 
 --
--- Structure de la table 'autoreg'
---
-
-CREATE TABLE autoreg (
-  id bigint(20) unsigned NOT NULL default '0',
-  priority int(11) NOT NULL default '0',
-  pattern varchar(255) NOT NULL default '',
-  hostid bigint(20) unsigned NOT NULL default '0',
-  PRIMARY KEY  (id)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
--- --------------------------------------------------------
-
---
 -- Structure de la table 'conditions'
 --
 
 CREATE TABLE conditions (
   conditionid bigint(20) unsigned NOT NULL default '0',
   actionid bigint(20) unsigned NOT NULL default '0',
   conditiontype int(11) NOT NULL default '0',
   operator int(11) NOT NULL default '0',
   `value` varchar(255) NOT NULL default '',
   PRIMARY KEY  (conditionid),
   KEY conditions_1 (actionid)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 -- --------------------------------------------------------
 
 --
@@ -261,33 +247,32 @@
 
 -- --------------------------------------------------------
 
 --
 -- Structure de la table 'events'
 --
 
 CREATE TABLE `events` (
   eventid bigint(20) unsigned NOT NULL default '0',
   source int(11) NOT NULL default '0',
   object int(11) NOT NULL default '0',
   objectid bigint(20) unsigned NOT NULL default '0',
   clock int(11) NOT NULL default '0',
   `value` int(11) NOT NULL default '0',
   acknowledged int(11) NOT NULL default '0',
   PRIMARY KEY  (eventid),
-  KEY events_3 (object,objectid,clock),
   KEY events_1 (object,objectid,eventid),
   KEY events_2 (clock)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 -- --------------------------------------------------------
 
 --
 -- Structure de la table 'functions'
 --
 
 CREATE TABLE functions (
   functionid bigint(20) unsigned NOT NULL default '0',
   itemid bigint(20) unsigned NOT NULL default '0',
   triggerid bigint(20) unsigned NOT NULL default '0',
   lastvalue varchar(255) default NULL,
   `function` varchar(12) NOT NULL default '',
@@ -499,33 +484,33 @@
 -- Structure de la table 'hosts'
 --
 
 CREATE TABLE `hosts` (
   hostid bigint(20) unsigned NOT NULL default '0',
   proxy_hostid bigint(20) unsigned NOT NULL default '0',
   host varchar(64) NOT NULL default '',
   dns varchar(64) NOT NULL default '',
   useip int(11) NOT NULL default '1',
   ip varchar(39) NOT NULL default '127.0.0.1',
   port int(11) NOT NULL default '10050',
   `status` int(11) NOT NULL default '0',
   disable_until int(11) NOT NULL default '0',
   error varchar(128) NOT NULL default '',
   available int(11) NOT NULL default '0',
   errors_from int(11) NOT NULL default '0',
-  lastaccess int(10) unsigned NOT NULL default '0',
+  lastaccess int(11) NOT NULL default '0',
   inbytes bigint(20) unsigned NOT NULL default '0',
   outbytes bigint(20) unsigned NOT NULL default '0',
   useipmi int(11) NOT NULL default '0',
   ipmi_port int(11) NOT NULL default '623',
   ipmi_authtype int(11) NOT NULL default '0',
   ipmi_privilege int(11) NOT NULL default '2',
   ipmi_username varchar(16) NOT NULL default '',
   ipmi_password varchar(20) NOT NULL default '',
   ipmi_disable_until int(11) NOT NULL default '0',
   ipmi_available int(11) NOT NULL default '0',
   snmp_disable_until int(11) NOT NULL default '0',
   snmp_available int(11) NOT NULL default '0',
   PRIMARY KEY  (hostid),
   KEY hosts_1 (host),
   KEY hosts_2 (`status`),
   KEY hosts_3 (proxy_hostid)
@@ -997,34 +982,32 @@
   `value` varchar(255) NOT NULL default '0',
   `status` int(11) NOT NULL default '0',
   PRIMARY KEY  (id),
   UNIQUE KEY id (id),
   KEY proxy_dhistory_1 (clock)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 -- --------------------------------------------------------
 
 --
 -- Structure de la table 'proxy_history'
 --
 
 CREATE TABLE proxy_history (
   id bigint(20) unsigned NOT NULL auto_increment,
   itemid bigint(20) unsigned NOT NULL default '0',
-  host varchar(64) NOT NULL default '',
-  key_ varchar(255) NOT NULL default '',
   clock int(11) NOT NULL default '0',
   `timestamp` int(11) NOT NULL default '0',
   source varchar(64) NOT NULL default '',
   severity int(11) NOT NULL default '0',
   `value` text NOT NULL,
   PRIMARY KEY  (id),
   UNIQUE KEY id (id),
   KEY proxy_history_1 (clock)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 -- --------------------------------------------------------
 
 --
 -- Structure de la table 'rights'
 --
 
@@ -1074,33 +1057,33 @@
   style int(11) NOT NULL default '0',
   url varchar(255) NOT NULL default '',
   `dynamic` int(11) NOT NULL default '0',
   PRIMARY KEY  (screenitemid)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 -- --------------------------------------------------------
 
 --
 -- Structure de la table 'scripts'
 --
 
 CREATE TABLE scripts (
   scriptid bigint(20) unsigned NOT NULL default '0',
   `name` varchar(255) NOT NULL default '',
   command varchar(255) NOT NULL default '',
-  host_access int(11) NOT NULL default '0',
+  host_access int(11) NOT NULL default '2',
   usrgrpid bigint(20) unsigned NOT NULL default '0',
   groupid bigint(20) unsigned NOT NULL default '0',
   PRIMARY KEY  (scriptid)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 -- --------------------------------------------------------
 
 --
 -- Structure de la table 'services'
 --
 
 CREATE TABLE services (
   serviceid bigint(20) unsigned NOT NULL default '0',
   `name` varchar(128) NOT NULL default '',
   `status` int(11) NOT NULL default '0',
   `algorithm` int(11) NOT NULL default '0',