- fixed calculation of aggregate items under Oracle (Alexei)

git-svn-id: svn://svn.zabbix.com/trunk@3738 97f52cf1-0a1b-0410-bd0e-c28be96e8082

2 files changed, 3 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 315b2a39..9d8bbe8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,6 +69,7 @@ Integrated from 1.1.x
 
 1.1.5
 
+ - fixed calculation of aggregate items under Oracle (Alexei)
  - added support of macro ITEM.NAME (Alexei)
  - fixed some assertions (Eugene)
  - fixed missing last symbol in vfs.file.regexp (Alexei)
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
 	{