summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-05-09 09:20:19 +0000
committeralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-05-09 09:20:19 +0000
commit5f4473e6d8594c7e0b2444a1bc36630d6a4b4ab7 (patch)
tree3a64448b6a097f790ddfc34022c9b0bdb224ee9f
parent406df3b06d638151e2daaadd4176602722eb7449 (diff)
downloadzabbix-5f4473e6d8594c7e0b2444a1bc36630d6a4b4ab7.tar.gz
zabbix-5f4473e6d8594c7e0b2444a1bc36630d6a4b4ab7.tar.xz
zabbix-5f4473e6d8594c7e0b2444a1bc36630d6a4b4ab7.zip
Minor fixes.
git-svn-id: svn://svn.zabbix.com/trunk@4103 97f52cf1-0a1b-0410-bd0e-c28be96e8082
-rw-r--r--upgrades/dbpatches/1.4/mysql/patch/items.sql3
-rw-r--r--upgrades/dbpatches/1.4/postgresql/patch/items.sql3
2 files changed, 4 insertions, 2 deletions
diff --git a/upgrades/dbpatches/1.4/mysql/patch/items.sql b/upgrades/dbpatches/1.4/mysql/patch/items.sql
index 2093e4a2..b4cbd028 100644
--- a/upgrades/dbpatches/1.4/mysql/patch/items.sql
+++ b/upgrades/dbpatches/1.4/mysql/patch/items.sql
@@ -32,12 +32,13 @@ CREATE TABLE items_tmp (
templateid bigint unsigned DEFAULT '0' NOT NULL,
valuemapid bigint unsigned DEFAULT '0' NOT NULL,
delay_flex varchar(255) DEFAULT '' NOT NULL,
+ params text DEFAULT '' NOT NULL,
PRIMARY KEY (itemid)
) ENGINE=InnoDB;
CREATE UNIQUE INDEX items_1 on items_tmp (hostid,key_);
CREATE INDEX items_2 on items_tmp (nextcheck);
CREATE INDEX items_3 on items_tmp (status);
-insert into items_tmp select *,'' from items;
+insert into items_tmp select *,'','' from items;
drop table items;
alter table items_tmp rename items;
diff --git a/upgrades/dbpatches/1.4/postgresql/patch/items.sql b/upgrades/dbpatches/1.4/postgresql/patch/items.sql
index f34aac7d..eeb7ecbe 100644
--- a/upgrades/dbpatches/1.4/postgresql/patch/items.sql
+++ b/upgrades/dbpatches/1.4/postgresql/patch/items.sql
@@ -32,12 +32,13 @@ CREATE TABLE items_tmp (
templateid bigint DEFAULT '0' NOT NULL,
valuemapid bigint DEFAULT '0' NOT NULL,
delay_flex varchar(255) DEFAULT '' NOT NULL,
+ params text DEFAULT '' NOT NULL,
PRIMARY KEY (itemid)
);
CREATE UNIQUE INDEX items_1 on items_tmp (hostid,key_);
CREATE INDEX items_2 on items_tmp (nextcheck);
CREATE INDEX items_3 on items_tmp (status);
-insert into items_tmp select *,'' from items;
+insert into items_tmp select *,'','' from items;
drop table items;
alter table items_tmp rename to items;