diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-09-08 11:52:38 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-09-08 11:52:38 +0000 |
| commit | af0a329b812599d79e26a59d9d8eaaa4312c2034 (patch) | |
| tree | a6b326d01bf7cf771b68c000eebd4918ffebedfd /src/zabbix_server/housekeeper | |
| parent | 3bf6b80b24fee06d1d8c7e2662a6a758aa1d4520 (diff) | |
| download | zabbix-af0a329b812599d79e26a59d9d8eaaa4312c2034.tar.gz zabbix-af0a329b812599d79e26a59d9d8eaaa4312c2034.tar.xz zabbix-af0a329b812599d79e26a59d9d8eaaa4312c2034.zip | |
ported 3274:3290 from 1.1.2 (Eugene)
- improved macro variables substitution in message body/subject (Eugene)
- minor fix of static linkage (Eugene)
- fixed support of PostgreSQL (Eugene)
- fixed DBinsert_id function for oracle (Eugene)
- fixed autoregistration in oracle system (Eugene)
- updated postgresql cheme, added start value for sequencers (Eugene)
- fixed limitation of return value of some items (Eugene)
- added color selection for trigger severity 'warning' and 'information' (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@3291 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/zabbix_server/housekeeper')
| -rw-r--r-- | src/zabbix_server/housekeeper/Makefile.am | 2 | ||||
| -rw-r--r-- | src/zabbix_server/housekeeper/housekeeper.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/zabbix_server/housekeeper/Makefile.am b/src/zabbix_server/housekeeper/Makefile.am index 308827dc..94f5ea6e 100644 --- a/src/zabbix_server/housekeeper/Makefile.am +++ b/src/zabbix_server/housekeeper/Makefile.am @@ -1,4 +1,4 @@ SUBDIRS= -INCLUDES=-I@top_srcdir@/include @MYSQL_INCLUDE@ @ORACLE_INCLUDE@ +INCLUDES=-I@top_srcdir@/include @MYSQL_INCLUDE@ @ORACLE_INCLUDE@ @PGSQL_INCLUDE@ lib_LIBRARIES=libzbxhousekeeper.a libzbxhousekeeper_a_SOURCES=housekeeper.c diff --git a/src/zabbix_server/housekeeper/housekeeper.c b/src/zabbix_server/housekeeper/housekeeper.c index 0df5e7b3..4535d2dd 100644 --- a/src/zabbix_server/housekeeper/housekeeper.c +++ b/src/zabbix_server/housekeeper/housekeeper.c @@ -90,6 +90,12 @@ static int housekeeping_process_log() #ifdef HAVE_ORACLE deleted = DBexecute("delete from %s where %s=%d and rownum<500",housekeeper.tablename, housekeeper.field,housekeeper.value); +#elif defined(HAVE_PGSQL) + snprintf(sql,sizeof(sql)-1,"delete from %s where oid in (select oid from %s where %s=%d limit 500)", + housekeeper.tablename, + housekeeper.tablename, + housekeeper.field, + housekeeper.value); #else deleted = DBexecute("delete from %s where %s=%d limit 500",housekeeper.tablename, housekeeper.field,housekeeper.value); #endif |