From 9ff7a278bca184372c54e36dd444cc52b3f395ca Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 26 Mar 2007 10:37:34 +0000 Subject: Fixed patch for table events. git-svn-id: svn://svn.zabbix.com/trunk@3924 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- upgrades/dbpatches/1.3/mysql/patch/events.sql | 2 +- upgrades/dbpatches/1.3/mysql/patch/functions.sql | 2 +- upgrades/dbpatches/1.3/postgresql/patch/events.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'upgrades/dbpatches') diff --git a/upgrades/dbpatches/1.3/mysql/patch/events.sql b/upgrades/dbpatches/1.3/mysql/patch/events.sql index b664f58f..e2c885f7 100644 --- a/upgrades/dbpatches/1.3/mysql/patch/events.sql +++ b/upgrades/dbpatches/1.3/mysql/patch/events.sql @@ -11,5 +11,5 @@ CREATE TABLE events ( CREATE INDEX events_1 on events (triggerid,source,clock); CREATE INDEX events_2 on events (clock); -insert into events select eventid,0,0,triggerid,clock,value,acknowledged from alarms; +insert into events select alarmid,0,0,triggerid,clock,value,acknowledged from alarms; drop table alarms; diff --git a/upgrades/dbpatches/1.3/mysql/patch/functions.sql b/upgrades/dbpatches/1.3/mysql/patch/functions.sql index 721b8ce0..e03de6e8 100644 --- a/upgrades/dbpatches/1.3/mysql/patch/functions.sql +++ b/upgrades/dbpatches/1.3/mysql/patch/functions.sql @@ -1,6 +1,6 @@ CREATE TABLE functions_tmp ( functionid bigint unsigned DEFAULT '0' NOT NULL, - itemid bigint unsigned DEFAULT '0' NOT NULL, + itemid bigint unsigned DEFAULT '0' NOT NULL, triggerid bigint unsigned DEFAULT '0' NOT NULL, lastvalue varchar(255) , function varchar(12) DEFAULT '' NOT NULL, diff --git a/upgrades/dbpatches/1.3/postgresql/patch/events.sql b/upgrades/dbpatches/1.3/postgresql/patch/events.sql index 71ecb9f1..e9d786b8 100644 --- a/upgrades/dbpatches/1.3/postgresql/patch/events.sql +++ b/upgrades/dbpatches/1.3/postgresql/patch/events.sql @@ -10,5 +10,5 @@ CREATE TABLE events ( CREATE INDEX events_1 on events (triggerid,source,clock); CREATE INDEX events_2 on events (clock); -insert into events select eventid,0,triggerid,clock,value,acknowledged from alarms; +insert into events select alarmid,0,triggerid,clock,value,acknowledged from alarms; drop table alarms; -- cgit