diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-04-28 14:07:11 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-04-28 14:07:11 +0000 |
| commit | 787911115963265dd4a9c8cae9178c4868c57e55 (patch) | |
| tree | 355a02048d6a92659aa8b087a7c0b5bf34f5a3d7 | |
| parent | 87785a8fbcd71409cca2413cdefb7d8ffe686e82 (diff) | |
| download | zabbix-787911115963265dd4a9c8cae9178c4868c57e55.tar.gz zabbix-787911115963265dd4a9c8cae9178c4868c57e55.tar.xz zabbix-787911115963265dd4a9c8cae9178c4868c57e55.zip | |
- [DEV-166] DM - Problem with node syncing
git-svn-id: svn://svn.zabbix.com/trunk@5663 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | create/data/data.sql | 2 | ||||
| -rw-r--r-- | create/schema/schema.sql | 7 | ||||
| -rw-r--r-- | frontends/php/include/maps.inc.php | 5 | ||||
| -rw-r--r-- | src/libs/zbxdbhigh/db.c | 2 |
5 files changed, 10 insertions, 7 deletions
@@ -1,5 +1,6 @@ Changes for 1.5.1: + - [DEV-166] fixed problem with node syncing (Sasha) - [DEV-145] added Ldap authentication (Artem) - [DEV-147] added support network and disk stats under OpenBSD (Sasha) - [DEV-164] added required server performance info to Status of ZABBIX (Alexei) diff --git a/create/data/data.sql b/create/data/data.sql index 3179c150..546fdf2a 100644 --- a/create/data/data.sql +++ b/create/data/data.sql @@ -21,7 +21,7 @@ -- Dumping data for table `config` -- -INSERT INTO config VALUES (1,365,365,600,'1-5,00:00-24:00',7,1,7,100,'default.css'); +INSERT INTO config VALUES (1,365,365,600,'1-5,00:00-24:00',7,1,7,100,'default.css',0,'',389,'','','',''); -- -- Dumping data for table `scripts` diff --git a/create/schema/schema.sql b/create/schema/schema.sql index afd8f952..6d270b17 100644 --- a/create/schema/schema.sql +++ b/create/schema/schema.sql @@ -627,12 +627,13 @@ FIELD |selementid2 |t_id |'0' |NOT NULL |ZBX_SYNC FIELD |drawtype |t_integer |'0' |NOT NULL |ZBX_SYNC FIELD |color |t_varchar(6) |'000000'|NOT NULL |ZBX_SYNC -TABLE|sysmaps_link_triggers|linkid,triggerid|ZBX_SYNC +TABLE|sysmaps_link_triggers|linktriggerid|ZBX_SYNC +FIELD |linktriggerid |t_id |'0' |NOT NULL |0 FIELD |linkid |t_id |'0' |NOT NULL |ZBX_SYNC -FIELD |triggerid |t_id | | |ZBX_SYNC +FIELD |triggerid |t_id |'0' |NOT NULL |ZBX_SYNC FIELD |drawtype |t_integer |'0' |NOT NULL |ZBX_SYNC FIELD |color |t_varchar(6) |'000000'|NOT NULL |ZBX_SYNC -INDEX |1 |linkid +UNIQUE |1 |linkid,triggerid TABLE|sysmaps_elements|selementid|ZBX_SYNC FIELD |selementid |t_id |'0' |NOT NULL |0 diff --git a/frontends/php/include/maps.inc.php b/frontends/php/include/maps.inc.php index f6cd6f54..47c20ca8 100644 --- a/frontends/php/include/maps.inc.php +++ b/frontends/php/include/maps.inc.php @@ -264,8 +264,9 @@ } function add_link_trigger($linkid,$triggerid,$drawtype,$color){ - $sql = 'INSERT INTO sysmaps_link_triggers (linkid,triggerid,drawtype,color) '. - " VALUES ('$linkid','$triggerid','$drawtype',".zbx_dbstr($color).")"; + $linktriggerid=get_dbid("sysmaps_link_triggers","linktriggerid"); + $sql = 'INSERT INTO sysmaps_link_triggers (linktriggerid,linkid,triggerid,drawtype,color) '. + " VALUES ('$linktriggerid','$linkid','$triggerid','$drawtype',".zbx_dbstr($color).")"; return DBexecute($sql); } diff --git a/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c index 871594d9..bcd84a74 100644 --- a/src/libs/zbxdbhigh/db.c +++ b/src/libs/zbxdbhigh/db.c @@ -747,7 +747,7 @@ void DBdelete_trigger(zbx_uint64_t triggerid) DBdelete_services_by_triggerid(triggerid); - DBexecute("delete sysmaps_link_triggers where triggerid=" ZBX_FS_UI64,triggerid); + DBexecute("delete from sysmaps_link_triggers where triggerid=" ZBX_FS_UI64,triggerid); DBexecute("delete from triggers where triggerid=" ZBX_FS_UI64,triggerid); } |