summaryrefslogtreecommitdiffstats
path: root/upgrades
diff options
context:
space:
mode:
authoralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-06-28 17:58:47 +0000
committeralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-06-28 17:58:47 +0000
commite08c804a632a1edbc463fb12f685b1bae054b0c5 (patch)
tree11bb70da12eaa1180f7ace0ec7129bf43be1ba1e /upgrades
parent6164f2ad424c3e594254cb9328dde89972b865d0 (diff)
downloadzabbix-e08c804a632a1edbc463fb12f685b1bae054b0c5.tar.gz
zabbix-e08c804a632a1edbc463fb12f685b1bae054b0c5.tar.xz
zabbix-e08c804a632a1edbc463fb12f685b1bae054b0c5.zip
- fixed upgrade of maps without backgrounds (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@4385 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'upgrades')
-rw-r--r--upgrades/dbpatches/1.4/mysql/patch/sysmaps.sql1
-rw-r--r--upgrades/dbpatches/1.4/postgresql/patch/sysmaps.sql1
2 files changed, 2 insertions, 0 deletions
diff --git a/upgrades/dbpatches/1.4/mysql/patch/sysmaps.sql b/upgrades/dbpatches/1.4/mysql/patch/sysmaps.sql
index e673e3af..35b6a0df 100644
--- a/upgrades/dbpatches/1.4/mysql/patch/sysmaps.sql
+++ b/upgrades/dbpatches/1.4/mysql/patch/sysmaps.sql
@@ -11,5 +11,6 @@ CREATE TABLE sysmaps_tmp (
CREATE INDEX sysmaps_1 on sysmaps_tmp (name);
insert into sysmaps_tmp select s.sysmapid,s.name,s.width,s.height,i.imageid,s.label_type,s.label_location from sysmaps s,images i where s.background=i.name;
+insert into sysmaps_tmp select s.sysmapid,s.name,s.width,s.height,0,s.label_type,s.label_location from sysmaps s where s.background='';
drop table sysmaps;
alter table sysmaps_tmp rename sysmaps;
diff --git a/upgrades/dbpatches/1.4/postgresql/patch/sysmaps.sql b/upgrades/dbpatches/1.4/postgresql/patch/sysmaps.sql
index ee0f0bca..57d59e75 100644
--- a/upgrades/dbpatches/1.4/postgresql/patch/sysmaps.sql
+++ b/upgrades/dbpatches/1.4/postgresql/patch/sysmaps.sql
@@ -11,5 +11,6 @@ CREATE TABLE sysmaps_tmp (
CREATE INDEX sysmaps_1 on sysmaps_tmp (name);
insert into sysmaps_tmp select s.sysmapid,s.name,s.width,s.height,i.imageid,s.label_type,s.label_location from sysmaps s,images i where s.background=i.name;
+insert into sysmaps_tmp select s.sysmapid,s.name,s.width,s.height,0,s.label_type,s.label_location from sysmaps s where s.background='';
drop table sysmaps;
alter table sysmaps_tmp rename to sysmaps;