diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/zabbix_server/evalfunc.c | 1 | ||||
| -rw-r--r-- | src/zabbix_server/functions.c | 3 |
3 files changed, 4 insertions, 1 deletions
@@ -1,5 +1,6 @@ Changes for 1.1beta10: + - fixed update of trigger status (Eugene) - fixed zabbix server crash after SQL request reading (Eugene) - renamed screens_items.resource -> resourcetype (Alexei) - renamed screens.rows ->vsize, cols -> hsize (Alexei) diff --git a/src/zabbix_server/evalfunc.c b/src/zabbix_server/evalfunc.c index 7d049986..843af929 100644 --- a/src/zabbix_server/evalfunc.c +++ b/src/zabbix_server/evalfunc.c @@ -366,6 +366,7 @@ static int evaluate_AVG(char *value,DB_ITEM *item,int parameter,int flag) result = DBselect(sql); row = DBfetch(result); + if(!row || DBis_null(row[0])==SUCCEED) { zabbix_log(LOG_LEVEL_DEBUG, "Result for AVG is empty" ); diff --git a/src/zabbix_server/functions.c b/src/zabbix_server/functions.c index fcf3e728..2f5f8edc 100644 --- a/src/zabbix_server/functions.c +++ b/src/zabbix_server/functions.c @@ -291,7 +291,7 @@ void update_triggers(int itemid) result = DBselect(sql); - while((row==DBfetch(result))) + while((row=DBfetch(result))) { trigger.triggerid=atoi(row[0]); strscpy(trigger.expression,row[1]); @@ -317,6 +317,7 @@ void update_triggers(int itemid) DBupdate_trigger_value(&trigger, exp_value, now, NULL); } DBfree_result(result); + zabbix_log( LOG_LEVEL_DEBUG, "End of update_triggers [%d]", itemid); } void calc_timestamp(char *line,int *timestamp, char *format) |