Index: src/backend/postmaster/pgstat.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/postmaster/pgstat.c,v
retrieving revision 1.149
diff -c -c -r1.149 pgstat.c
*** src/backend/postmaster/pgstat.c	16 Mar 2007 17:57:36 -0000	1.149
--- src/backend/postmaster/pgstat.c	22 Mar 2007 14:40:36 -0000
***************
*** 572,577 ****
--- 572,581 ----
  	return 0;
  }
  
+ void allow_immediate_pgstat_restart(void)
+ {
+ 		last_pgstat_start_time = 0;
+ }
  
  /* ------------------------------------------------------------
   * Public functions used by backends follow
Index: src/backend/postmaster/postmaster.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v
retrieving revision 1.526
diff -c -c -r1.526 postmaster.c
*** src/backend/postmaster/postmaster.c	7 Mar 2007 13:35:02 -0000	1.526
--- src/backend/postmaster/postmaster.c	22 Mar 2007 14:40:37 -0000
***************
*** 1896,1902 ****
--- 1896,1905 ----
  				signal_child(PgArchPID, SIGQUIT);
  			/* Tell pgstat to shut down too; nothing left for it to do */
  			if (PgStatPID != 0)
+ 			{
  				signal_child(PgStatPID, SIGQUIT);
+ 				allow_immediate_pgstat_restart();
+ 			}
  			/* Tell autovac launcher to shut down too */
  			if (AutoVacPID != 0)
  				signal_child(AutoVacPID, SIGTERM);
***************
*** 1952,1958 ****
--- 1955,1964 ----
  				signal_child(PgArchPID, SIGQUIT);
  			/* Tell pgstat to shut down too; nothing left for it to do */
  			if (PgStatPID != 0)
+ 			{
  				signal_child(PgStatPID, SIGQUIT);
+ 				allow_immediate_pgstat_restart();
+ 			}
  			/* Tell autovac launcher to shut down too */
  			if (AutoVacPID != 0)
  				signal_child(AutoVacPID, SIGTERM);
***************
*** 2241,2247 ****
--- 2247,2256 ----
  			signal_child(PgArchPID, SIGQUIT);
  		/* Tell pgstat to shut down too; nothing left for it to do */
  		if (PgStatPID != 0)
+ 		{
  			signal_child(PgStatPID, SIGQUIT);
+ 			allow_immediate_pgstat_restart();
+ 		}
  		/* Tell autovac launcher to shut down too */
  		if (AutoVacPID != 0)
  			signal_child(AutoVacPID, SIGTERM);
***************
*** 2404,2409 ****
--- 2413,2419 ----
  								 "SIGQUIT",
  								 (int) PgStatPID)));
  		signal_child(PgStatPID, SIGQUIT);
+ 		allow_immediate_pgstat_restart();
  	}
  
  	/* We do NOT restart the syslogger */
Index: src/include/pgstat.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/pgstat.h,v
retrieving revision 1.55
diff -c -c -r1.55 pgstat.h
*** src/include/pgstat.h	16 Mar 2007 17:57:36 -0000	1.55
--- src/include/pgstat.h	22 Mar 2007 14:40:38 -0000
***************
*** 369,375 ****
  extern void pgstat_init(void);
  extern int	pgstat_start(void);
  extern void pgstat_reset_all(void);
! 
  #ifdef EXEC_BACKEND
  extern void PgstatCollectorMain(int argc, char *argv[]);
  #endif
--- 369,375 ----
  extern void pgstat_init(void);
  extern int	pgstat_start(void);
  extern void pgstat_reset_all(void);
! extern void allow_immediate_pgstat_restart(void);
  #ifdef EXEC_BACKEND
  extern void PgstatCollectorMain(int argc, char *argv[]);
  #endif