diff -Nur zabbix-1.5.3/include/db.h zabbix-1.5.3.fike/include/db.h --- zabbix-1.5.3/include/db.h 2008-06-04 16:57:03.000000000 -0300 +++ zabbix-1.5.3.fike/include/db.h 2008-08-04 11:05:50.168828859 -0300 @@ -487,7 +487,6 @@ void DBinit(); void DBclose(void); -void DBvacuum(void); #ifdef HAVE___VA_ARGS__ # define DBexecute(fmt, ...) __zbx_DBexecute(ZBX_CONST_STRING(fmt), ##__VA_ARGS__) diff -Nur zabbix-1.5.3/include/zbxdb.h zabbix-1.5.3.fike/include/zbxdb.h --- zabbix-1.5.3/include/zbxdb.h 2008-06-04 16:57:03.000000000 -0300 +++ zabbix-1.5.3.fike/include/zbxdb.h 2008-08-04 11:06:12.440828932 -0300 @@ -116,7 +116,6 @@ void zbx_db_init(char *host, char *user, char *password, char *dbname, char *dbsocket, int port); void zbx_db_close(void); -void zbx_db_vacuum(void); int zbx_db_vexecute(const char *fmt, va_list args); diff -Nur zabbix-1.5.3/src/libs/zbxdbhigh/db.c zabbix-1.5.3.fike/src/libs/zbxdbhigh/db.c --- zabbix-1.5.3/src/libs/zbxdbhigh/db.c 2008-06-04 16:57:04.000000000 -0300 +++ zabbix-1.5.3.fike/src/libs/zbxdbhigh/db.c 2008-08-04 11:08:06.687853764 -0300 @@ -1601,32 +1601,6 @@ return SUCCEED; } -void DBvacuum(void) -{ -#ifdef HAVE_POSTGRESQL - char *table_for_housekeeping[]={"services", "services_links", "graphs_items", "graphs", "sysmaps_links", - "sysmaps_elements", "sysmaps_link_triggers","sysmaps", "config", "groups", "hosts_groups", "alerts", - "actions", "events", "functions", "history", "history_str", "hosts", "trends", - "items", "media", "media_type", "triggers", "trigger_depends", "users", - "sessions", "rights", "service_alarms", "profiles", "screens", "screens_items", - NULL}; - - char *table; - int i; - - zbx_setproctitle("housekeeper [vacuum DB]"); - - i=0; - while (NULL != (table = table_for_housekeeping[i++])) - { - DBexecute("vacuum analyze %s", table); - } -#endif - -#ifdef HAVE_MYSQL - /* Nothing to do */ -#endif -} void DBescape_string(const char *str, char *to, int maxlen) { /* NOTE: sync changes with 'DBdyn_escape_string' */ diff -Nur zabbix-1.5.3/src/zabbix_server/housekeeper/housekeeper.c zabbix-1.5.3.fike/src/zabbix_server/housekeeper/housekeeper.c --- zabbix-1.5.3/src/zabbix_server/housekeeper/housekeeper.c 2008-06-04 16:57:03.000000000 -0300 +++ zabbix-1.5.3.fike/src/zabbix_server/housekeeper/housekeeper.c 2008-08-04 11:08:40.159854884 -0300 @@ -354,13 +354,6 @@ housekeeping_sessions(now); - zbx_setproctitle("housekeeper [vacuuming database]"); - -/* Transaction is not required here. It causes timeouts under MySQL */ -/* DBcommit();*/ - - DBvacuum(); - zabbix_log( LOG_LEVEL_DEBUG, "Sleeping for %d hours", CONFIG_HOUSEKEEPING_FREQUENCY);