I found that postgresql.conf in CVS didn't have the initdb defaults for
two values, making the replaced initdb postgresql.conf comments not line
up.  This applied patch fixes that.

-- 
  Bruce Momjian   [EMAIL PROTECTED]
  EnterpriseDB    http://www.enterprisedb.com

  + If your life is a hard drive, Christ can be your backup. +
Index: src/backend/utils/misc/postgresql.conf.sample
===================================================================
RCS file: /cvsroot/pgsql/src/backend/utils/misc/postgresql.conf.sample,v
retrieving revision 1.191
diff -c -c -r1.191 postgresql.conf.sample
*** src/backend/utils/misc/postgresql.conf.sample	2 Sep 2006 23:12:16 -0000	1.191
--- src/backend/utils/misc/postgresql.conf.sample	14 Sep 2006 23:19:18 -0000
***************
*** 98,104 ****
  
  # - Memory -
  
! #shared_buffers = 1000			# min 16 or max_connections*2, 8kB each
  					# (change requires restart)
  #temp_buffers = 1000			# min 100, 8kB each
  #max_prepared_transactions = 5		# can be 0 or more
--- 98,104 ----
  
  # - Memory -
  
! #shared_buffers = 32000kB		# min 16 or max_connections*2, 8kB each
  					# (change requires restart)
  #temp_buffers = 1000			# min 100, 8kB each
  #max_prepared_transactions = 5		# can be 0 or more
***************
*** 111,117 ****
  
  # - Free Space Map -
  
! #max_fsm_pages = 20000			# min max_fsm_relations*16, 6 bytes each
  					# (change requires restart)
  #max_fsm_relations = 1000		# min 100, ~70 bytes each
  					# (change requires restart)
--- 111,117 ----
  
  # - Free Space Map -
  
! #max_fsm_pages = 1600000		# min max_fsm_relations*16, 6 bytes each
  					# (change requires restart)
  #max_fsm_relations = 1000		# min 100, ~70 bytes each
  					# (change requires restart)
Index: src/bin/initdb/initdb.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/initdb/initdb.c,v
retrieving revision 1.121
diff -c -c -r1.121 initdb.c
*** src/bin/initdb/initdb.c	20 Aug 2006 16:08:09 -0000	1.121
--- src/bin/initdb/initdb.c	14 Sep 2006 23:19:18 -0000
***************
*** 1214,1223 ****
  	conflines = replace_token(conflines, "#max_connections = 100", repltok);
  
  	snprintf(repltok, sizeof(repltok), "shared_buffers = %dkB", n_buffers);
! 	conflines = replace_token(conflines, "#shared_buffers = 1000", repltok);
  
  	snprintf(repltok, sizeof(repltok), "max_fsm_pages = %d", n_fsm_pages);
! 	conflines = replace_token(conflines, "#max_fsm_pages = 20000", repltok);
  
  #if DEF_PGPORT != 5432
  	snprintf(repltok, sizeof(repltok), "#port = %d", DEF_PGPORT);
--- 1214,1223 ----
  	conflines = replace_token(conflines, "#max_connections = 100", repltok);
  
  	snprintf(repltok, sizeof(repltok), "shared_buffers = %dkB", n_buffers);
! 	conflines = replace_token(conflines, "#shared_buffers = 32000kB", repltok);
  
  	snprintf(repltok, sizeof(repltok), "max_fsm_pages = %d", n_fsm_pages);
! 	conflines = replace_token(conflines, "#max_fsm_pages = 1600000", repltok);
  
  #if DEF_PGPORT != 5432
  	snprintf(repltok, sizeof(repltok), "#port = %d", DEF_PGPORT);
---------------------------(end of broadcast)---------------------------
TIP 3: Have you checked our extensive FAQ?

               http://www.postgresql.org/docs/faq

Reply via email to