summaryrefslogtreecommitdiffstats
path: root/upgrades
diff options
context:
space:
mode:
authoralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-03-26 10:37:34 +0000
committeralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-03-26 10:37:34 +0000
commit9ff7a278bca184372c54e36dd444cc52b3f395ca (patch)
treeadd2a3fee82b3992d18ab654dd6745d6abe5a4bd /upgrades
parentae18ba2568d312ad4db131752c76c471d0268f28 (diff)
downloadzabbix-9ff7a278bca184372c54e36dd444cc52b3f395ca.tar.gz
zabbix-9ff7a278bca184372c54e36dd444cc52b3f395ca.tar.xz
zabbix-9ff7a278bca184372c54e36dd444cc52b3f395ca.zip
Fixed patch for table events.
git-svn-id: svn://svn.zabbix.com/trunk@3924 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'upgrades')
-rw-r--r--upgrades/dbpatches/1.3/mysql/patch/events.sql2
-rw-r--r--upgrades/dbpatches/1.3/mysql/patch/functions.sql2
-rw-r--r--upgrades/dbpatches/1.3/postgresql/patch/events.sql2
3 files changed, 3 insertions, 3 deletions
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;