diff options
Diffstat (limited to 'src/libs')
-rw-r--r-- | src/libs/zbxdbhigh/db.c | 3 | ||||
-rw-r--r-- | src/libs/zbxdbhigh/host.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c index a887d252..94720010 100644 --- a/src/libs/zbxdbhigh/db.c +++ b/src/libs/zbxdbhigh/db.c @@ -740,7 +740,8 @@ void DBdelete_trigger(zbx_uint64_t triggerid) triggerid); DBexecute("delete from functions where triggerid=" ZBX_FS_UI64, triggerid); - DBexecute("delete from events where triggerid=" ZBX_FS_UI64, + DBexecute("delete from events where object=%d AND objectid=" ZBX_FS_UI64, + EVENT_OBJECT_TRIGGER, triggerid); /* zbx_snprintf(sql,sizeof(sql),"delete from actions where triggerid=%d and scope=%d", triggerid, ACTION_SCOPE_TRIGGER); DBexecute(sql);*/ diff --git a/src/libs/zbxdbhigh/host.c b/src/libs/zbxdbhigh/host.c index 81159296..fe2f88bd 100644 --- a/src/libs/zbxdbhigh/host.c +++ b/src/libs/zbxdbhigh/host.c @@ -3053,8 +3053,7 @@ static int DBadd_event( if( !now ) now = time(NULL); - db_events = DBselect("select value,clock from events where objectid=" ZBX_FS_UI64 " and object=%i " - " order by clock desc", triggerid, EVENT_OBJECT_TRIGGER); + db_events = DBselect("select lastvalue,type from triggers where triggerid=" ZBX_FS_UI64, triggerid); if( (event_data = DBfetch(db_events)) ) { |