summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-07-05 07:32:53 +0000
committeralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-07-05 07:32:53 +0000
commit07cfbfcc8ce3fae0a51f335ab0bcfadf133473e9 (patch)
treece5cefdb4d8ce8215e4bc41c6995827cf2e01f71 /src
parent820e26fa20119c6aa2b55179381fdfacc083906e (diff)
svn merge -r4432:4433 svn://svn.zabbix.com/branches/1.4.2
- fixed housekeeper to process history_text (Alexei) git-svn-id: svn://svn.zabbix.com/trunk@4434 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
-rw-r--r--src/zabbix_server/housekeeper/housekeeper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/zabbix_server/housekeeper/housekeeper.c b/src/zabbix_server/housekeeper/housekeeper.c
index 27aab5ff..048ac76e 100644
--- a/src/zabbix_server/housekeeper/housekeeper.c
+++ b/src/zabbix_server/housekeeper/housekeeper.c
@@ -288,7 +288,7 @@ static int housekeeping_history_and_trends(int now)
deleted += delete_history("history", item.itemid, item.history, now);
deleted += delete_history("history_uint", item.itemid, item.history, now);
deleted += delete_history("history_str", item.itemid, item.history, now);
- deleted += delete_history("history_str", item.itemid, item.history, now);
+ deleted += delete_history("history_text", item.itemid, item.history, now);
deleted += delete_history("history_log", item.itemid, item.history, now);
deleted += delete_history("trends", item.itemid, item.trends, now);
}