Index: src/backend/tcop/postgres.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/backend/tcop/postgres.c,v
retrieving revision 1.367
diff -c -c -r1.367 postgres.c
*** src/backend/tcop/postgres.c	29 Sep 2003 00:05:25 -0000	1.367
--- src/backend/tcop/postgres.c	29 Sep 2003 18:28:27 -0000
***************
*** 955,979 ****
  		usecs = (long) (stop_t.tv_sec - start_t.tv_sec) * 1000000 + (long) (stop_t.tv_usec - start_t.tv_usec);
  
  		/*
! 		 * Output a duration_query to the log if the query has exceeded
! 		 * the min duration.
  		 */
! 		if (usecs >= save_log_min_duration_statement * 1000)
  			ereport(LOG,
! 					(errmsg("duration_statement: %ld.%06ld %s",
  							(long) (stop_t.tv_sec - start_t.tv_sec),
  							(long) (stop_t.tv_usec - start_t.tv_usec),
  							query_string)));
- 
- 		/*
- 		 * If the user is requesting logging of all durations, then log
- 		 * that as well.
- 		 */
- 		if (save_log_duration)
- 			ereport(LOG,
- 					(errmsg("duration: %ld.%06ld sec",
- 							(long) (stop_t.tv_sec - start_t.tv_sec),
- 							(long) (stop_t.tv_usec - start_t.tv_usec))));
  	}
  
  	if (save_log_statement_stats)
--- 955,971 ----
  		usecs = (long) (stop_t.tv_sec - start_t.tv_sec) * 1000000 + (long) (stop_t.tv_usec - start_t.tv_usec);
  
  		/*
! 		 * Output a duration_statement to the log if the query has exceeded
! 		 * the min duration, or if we are to print all durations.
  		 */
! 		if (save_log_duration ||
! 			(save_log_min_duration_statement > 0 &&
! 			 usecs >= save_log_min_duration_statement * 1000))
  			ereport(LOG,
! 					(errmsg("duration: %ld.%06ld %s",
  							(long) (stop_t.tv_sec - start_t.tv_sec),
  							(long) (stop_t.tv_usec - start_t.tv_usec),
  							query_string)));
  	}
  
  	if (save_log_statement_stats)