summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2003-05-13 13:32:58 +0000
committerhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2003-05-13 13:32:58 +0000
commitfd55d26e13f70783d9d11a6548409bbf6fd246f2 (patch)
tree3c6a22501bcdd9961b20a4e4cf72928d1bc47b4f /include
parent346ba1e6812e2f20664909e5efabbfdfc66fe114 (diff)
Minor fix.
git-svn-id: svn://svn.zabbix.com/trunk@770 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'include')
-rw-r--r--include/functions.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/functions.c b/include/functions.c
index b84dabaa..596650a1 100644
--- a/include/functions.c
+++ b/include/functions.c
@@ -1037,7 +1037,7 @@ void update_triggers(int itemid)
/* Does not work for PostgreSQL */
/* sprintf(sql,"select t.triggerid,t.expression,t.status,t.dep_level,t.priority,t.value from triggers t,functions f,items i where i.status<>3 and i.itemid=f.itemid and t.status=%d and f.triggerid=t.triggerid and f.itemid=%d group by t.triggerid,t.expression,t.dep_level",TRIGGER_STATUS_ENABLED,sucker_num);*/
/* Is it correct SQL? */
- sprintf(sql,"select distinct t.triggerid,t.expression,t.status,t.dep_level,t.priority,t.value from triggers t,functions f,items i where i.status<>%d and i.itemid=f.itemid and t.status=%d and f.triggerid=t.triggerid and f.itemid=%d",ITEM_STATUS_NOTSUPPORTED, TRIGGER_STATUS_ENABLED, itemid);
+ sprintf(sql,"select distinct t.triggerid,t.expression,t.status,t.dep_level,t.priority,t.value,t.description from triggers t,functions f,items i where i.status<>%d and i.itemid=f.itemid and t.status=%d and f.triggerid=t.triggerid and f.itemid=%d",ITEM_STATUS_NOTSUPPORTED, TRIGGER_STATUS_ENABLED, itemid);
result = DBselect(sql);
@@ -1049,6 +1049,7 @@ void update_triggers(int itemid)
trigger.priority=atoi(DBget_field(result,i,4));
trigger.value=atoi(DBget_field(result,i,5));
+ trigger.description=DBget_field(result,i,6);
strncpy(exp, trigger.expression, MAX_STRING_LEN);
if( evaluate_expression(&b, exp) != 0 )
{