summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-01-20 14:22:30 +0000
committeralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-01-20 14:22:30 +0000
commit1970291fea95cc08fceff4e859b98dab47cbc6cb (patch)
tree9dbce1107287ff7a949a3a6424dddc0fc154d13b /src
parent2d739395b997f9a16835fdfcb969cc507f77fed9 (diff)
downloadzabbix-1970291fea95cc08fceff4e859b98dab47cbc6cb.tar.gz
zabbix-1970291fea95cc08fceff4e859b98dab47cbc6cb.tar.xz
zabbix-1970291fea95cc08fceff4e859b98dab47cbc6cb.zip
- fixed calculation of aggregate items under Oracle (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@3738 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
-rw-r--r--src/zabbix_server/poller/checks_aggregate.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/zabbix_server/poller/checks_aggregate.c b/src/zabbix_server/poller/checks_aggregate.c
index 14272dd1..35ca47f4 100644
--- a/src/zabbix_server/poller/checks_aggregate.c
+++ b/src/zabbix_server/poller/checks_aggregate.c
@@ -135,8 +135,8 @@ static int evaluate_aggregate(AGENT_RESULT *res,char *grpfunc, char *hostgroup,
(strcmp(itemfunc,"sum") == 0)
)
{
- zbx_snprintf(sql,sizeof(sql),"select h.itemid,i.value_type,%s(h.value) from items i,history h where h.itemid=i.itemid and h.itemid in (%s) and h.clock>%d group by 1,2",itemfunc, items, now - atoi(param));
- zbx_snprintf(sql2,sizeof(sql),"select h.itemid,i.value_type,%s(h.value) from items i,history_uint h where h.itemid=i.itemid and h.itemid in (%s) and h.clock>%d group by 1,2",itemfunc, items, now - atoi(param));
+ zbx_snprintf(sql,sizeof(sql),"select h.itemid,i.value_type,%s(h.value) from items i,history h where h.itemid=i.itemid and h.itemid in (%s) and h.clock>%d group by h.itemid,i.value_type",itemfunc, items, now - atoi(param));
+ zbx_snprintf(sql2,sizeof(sql),"select h.itemid,i.value_type,%s(h.value) from items i,history_uint h where h.itemid=i.itemid and h.itemid in (%s) and h.clock>%d group by h.itemid,i.value_type",itemfunc, items, now - atoi(param));
}
else
{