Index: src/backend/utils/misc/postgresql.conf.sample
===================================================================
RCS file: /cvsroot/pgsql-server/src/backend/utils/misc/postgresql.conf.sample,v
retrieving revision 1.84
diff -c -c -r1.84 postgresql.conf.sample
*** src/backend/utils/misc/postgresql.conf.sample	14 Jul 2003 20:00:22 -0000	1.84
--- src/backend/utils/misc/postgresql.conf.sample	18 Jul 2003 19:14:18 -0000
***************
*** 1,4 ****
! #
  # PostgreSQL configuration file
  # -----------------------------
  #
--- 1,4 ----
! # -----------------------------
  # PostgreSQL configuration file
  # -----------------------------
  #
***************
*** 21,36 ****
  # "pg_ctl reload".
  
  
! #========================================================================
! 
! 
! #
! #	Connection Parameters
! #
! 
  # CONNECTIONS AND AUTHENTICATION
! # ----------------------------------
! # Connection Settings
  
  #tcpip_socket = false
  #max_connections = 32
--- 21,31 ----
  # "pg_ctl reload".
  
  
! #---------------------------------------------------------------------------
  # CONNECTIONS AND AUTHENTICATION
! #---------------------------------------------------------------------------
! 
! # - Connection Settings -
  
  #tcpip_socket = false
  #max_connections = 32
***************
*** 44,50 ****
  #unix_socket_permissions = 0777	# octal
  #virtual_host = ''
  
! # Security & Authentication
  
  #authentication_timeout = 60	# 1-600, in seconds
  #ssl = false
--- 39,45 ----
  #unix_socket_permissions = 0777	# octal
  #virtual_host = ''
  
! # - Security & Authentication -
  
  #authentication_timeout = 60	# 1-600, in seconds
  #ssl = false
***************
*** 53,87 ****
  #db_user_namespace = false
  
  
  # RESOURCE USAGE (except WAL)
! # ---------------------------------
! # Memory
  
  #shared_buffers = 64		# min 16, at least max_connections*2, 8KB each
  #sort_mem = 1024		# min 64, size in KB
  #vacuum_mem = 8192		# min 1024, size in KB
  
! # Free Space Map
  
  #max_fsm_pages = 20000		# min max_fsm_relations*16, 6 bytes each
  #max_fsm_relations = 1000	# min 100, ~50 bytes each
  
! # Kernel Resource Usage
  
  #max_files_per_process = 1000	# min 25
  #preload_libraries = ''
  
  
  # WRITE AHEAD LOG
! # ---------------------------------
! # Settings
  
  #fsync = true			# turns forced synchronization on or off
  #wal_sync_method = fsync	# the default varies across platforms:
  				# fsync, fdatasync, open_sync, or open_datasync
  #wal_buffers = 8		# min 4, 8KB each
  
! # Checkpoints
  
  #checkpoint_segments = 3	# in logfile segments, min 1, 16MB each
  #checkpoint_timeout = 300	# range 30-3600, in seconds
--- 48,86 ----
  #db_user_namespace = false
  
  
+ #---------------------------------------------------------------------------
  # RESOURCE USAGE (except WAL)
! #---------------------------------------------------------------------------
! 
! # - Memory -
  
  #shared_buffers = 64		# min 16, at least max_connections*2, 8KB each
  #sort_mem = 1024		# min 64, size in KB
  #vacuum_mem = 8192		# min 1024, size in KB
  
! # - Free Space Map -
  
  #max_fsm_pages = 20000		# min max_fsm_relations*16, 6 bytes each
  #max_fsm_relations = 1000	# min 100, ~50 bytes each
  
! # - Kernel Resource Usage -
  
  #max_files_per_process = 1000	# min 25
  #preload_libraries = ''
  
  
+ #---------------------------------------------------------------------------
  # WRITE AHEAD LOG
! #---------------------------------------------------------------------------
! 
! # - Settings -
  
  #fsync = true			# turns forced synchronization on or off
  #wal_sync_method = fsync	# the default varies across platforms:
  				# fsync, fdatasync, open_sync, or open_datasync
  #wal_buffers = 8		# min 4, 8KB each
  
! # - Checkpoints -
  
  #checkpoint_segments = 3	# in logfile segments, min 1, 16MB each
  #checkpoint_timeout = 300	# range 30-3600, in seconds
***************
*** 90,98 ****
  #commit_siblings = 5		# range 1-1000
  
  
  # QUERY TUNING
! # --------------------------------
! # Planner Method Enabling
  
  #enable_hashagg = true
  #enable_hashjoin = true
--- 89,99 ----
  #commit_siblings = 5		# range 1-1000
  
  
+ #---------------------------------------------------------------------------
  # QUERY TUNING
! #---------------------------------------------------------------------------
! 
! # - Planner Method Enabling -
  
  #enable_hashagg = true
  #enable_hashjoin = true
***************
*** 103,109 ****
  #enable_sort = true
  #enable_tidscan = true
  
! # Planner Cost Constants
  
  #effective_cache_size = 1000	# typically 8KB each
  #random_page_cost = 4		# units are one sequential page fetch cost
--- 104,110 ----
  #enable_sort = true
  #enable_tidscan = true
  
! # - Planner Cost Constants -
  
  #effective_cache_size = 1000	# typically 8KB each
  #random_page_cost = 4		# units are one sequential page fetch cost
***************
*** 111,117 ****
  #cpu_index_tuple_cost = 0.001	# (same)
  #cpu_operator_cost = 0.0025	# (same)
  
! # Genetic Query Optimizer
  
  #geqo = true
  #geqo_threshold = 11
--- 112,118 ----
  #cpu_index_tuple_cost = 0.001	# (same)
  #cpu_operator_cost = 0.0025	# (same)
  
! # - Genetic Query Optimizer -
  
  #geqo = true
  #geqo_threshold = 11
***************
*** 122,143 ****
  #geqo_random_seed = -1		# -1 = use variable seed
  #geqo_selection_bias = 2.0	# range 1.5-2.0
  
! # Other Planner Options
  
  #default_statistics_target = 10	# range 1-1000
  #from_collapse_limit = 8
  #join_collapse_limit = 8	# 1 disables collapsing of explicit JOINs
  
  
  # ERROR REPORTING AND LOGGING
! # ------------------------------------
! # Syslog
  
  #syslog = 0			# range 0-2
  #syslog_facility = 'LOCAL0'
  #syslog_ident = 'postgres'
  
! # When to Log
  
  #client_min_messages = notice	# Values, in order of decreasing detail:
  				#   debug5, debug4, debug3, debug2, debug1,
--- 123,146 ----
  #geqo_random_seed = -1		# -1 = use variable seed
  #geqo_selection_bias = 2.0	# range 1.5-2.0
  
! # - Other Planner Options -
  
  #default_statistics_target = 10	# range 1-1000
  #from_collapse_limit = 8
  #join_collapse_limit = 8	# 1 disables collapsing of explicit JOINs
  
  
+ #---------------------------------------------------------------------------
  # ERROR REPORTING AND LOGGING
! #---------------------------------------------------------------------------
! 
! # - Syslog -
  
  #syslog = 0			# range 0-2
  #syslog_facility = 'LOCAL0'
  #syslog_ident = 'postgres'
  
! # - When to Log -
  
  #client_min_messages = notice	# Values, in order of decreasing detail:
  				#   debug5, debug4, debug3, debug2, debug1,
***************
*** 160,166 ****
  
  #silent_mode = false		 # DO NOT USE without Syslog!
  
! # What to Log
  
  #debug_print_parse = false
  #debug_print_rewritten = false
--- 163,169 ----
  
  #silent_mode = false		 # DO NOT USE without Syslog!
  
! # - What to Log -
  
  #debug_print_parse = false
  #debug_print_rewritten = false
***************
*** 174,189 ****
  #log_hostname = false
  #log_source_port = false
  
  # RUNTIME STATISTICS
! # -------------------------------------
! # Statistics Monitoring
  
  #log_parser_stats = false
  #log_planner_stats = false
  #log_executor_stats = false
  #log_statement_stats = false
  
! # Query/Index Statistics Collector
  
  #stats_start_collector = true
  #stats_command_string = false
--- 177,195 ----
  #log_hostname = false
  #log_source_port = false
  
+ 
+ #---------------------------------------------------------------------------
  # RUNTIME STATISTICS
! #---------------------------------------------------------------------------
! 
! # - Statistics Monitoring -
  
  #log_parser_stats = false
  #log_planner_stats = false
  #log_executor_stats = false
  #log_statement_stats = false
  
! # - Query/Index Statistics Collector -
  
  #stats_start_collector = true
  #stats_command_string = false
***************
*** 192,207 ****
  #stats_reset_on_server_start = true
  
  
  # CLIENT CONNECTION DEFAULTS
! # -------------------------------------
! # Statement Behavior
  
  #search_path = '$user,public'	# schema names
  #default_transaction_isolation = 'read committed'
  #default_transaction_read_only = false
  #statement_timeout = 0		# 0 is disabled, in milliseconds
  
! # Locale and Formatting
  
  #datestyle = 'iso, us'
  #timezone = unknown		# actually, defaults to TZ environment setting
--- 198,215 ----
  #stats_reset_on_server_start = true
  
  
+ #---------------------------------------------------------------------------
  # CLIENT CONNECTION DEFAULTS
! #---------------------------------------------------------------------------
! 
! # - Statement Behavior -
  
  #search_path = '$user,public'	# schema names
  #default_transaction_isolation = 'read committed'
  #default_transaction_read_only = false
  #statement_timeout = 0		# 0 is disabled, in milliseconds
  
! # - Locale and Formatting -
  
  #datestyle = 'iso, us'
  #timezone = unknown		# actually, defaults to TZ environment setting
***************
*** 215,241 ****
  #lc_numeric = 'C'		# locale for number formatting
  #lc_time = 'C'			# locale for time formatting
  
! # Other Defaults
  
  #explain_pretty_print = true
  #dynamic_library_path = '$libdir'
  #max_expr_depth = 10000		# min 10
  
  # LOCK MANAGEMENT
! # -----------------------------------------
  
  #deadlock_timeout = 1000	# in milliseconds
  #max_locks_per_transaction = 64	# min 10, ~260*max_connections bytes each
  
  
  # VERSION/PLATFORM COMPATIBILITY
! # -----------------------------------------
! # Previous Postgres Versions
  
  #add_missing_from = true
  #regex_flavor = advanced	# advanced, extended, or basic
  #sql_inheritance = true
  
! # Other Platforms & Clients
  
  #transform_null_equals = false
--- 223,253 ----
  #lc_numeric = 'C'		# locale for number formatting
  #lc_time = 'C'			# locale for time formatting
  
! # - Other Defaults -
  
  #explain_pretty_print = true
  #dynamic_library_path = '$libdir'
  #max_expr_depth = 10000		# min 10
  
+ 
+ #---------------------------------------------------------------------------
  # LOCK MANAGEMENT
! #---------------------------------------------------------------------------
  
  #deadlock_timeout = 1000	# in milliseconds
  #max_locks_per_transaction = 64	# min 10, ~260*max_connections bytes each
  
  
+ #---------------------------------------------------------------------------
  # VERSION/PLATFORM COMPATIBILITY
! #---------------------------------------------------------------------------
! 
! # - Previous Postgres Versions -
  
  #add_missing_from = true
  #regex_flavor = advanced	# advanced, extended, or basic
  #sql_inheritance = true
  
! # - Other Platforms & Clients -
  
  #transform_null_equals = false