Make postgresql.conf.sample match the initdb defaults. This fixes

comment alignment on most systems.

diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index dcd3a02443210ea9e873dd9251d919b03932cd73..178ba15025703d31715481e7dde20f6fa79465c1 100644 (file)
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -98,7 +98,7 @@
 
 # - Memory -
 
-#shared_buffers = 1000         # min 16 or max_connections*2, 8kB each
+#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,7 +111,7 @@
 
 # - Free Space Map -
 
-#max_fsm_pages = 20000         # min max_fsm_relations*16, 6 bytes each
+#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)

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 5275884e171d7b891d402bf9daff95de690a3071..1c5989a4ef3c5765e3cff775ec9e15ccf18258ca 100644 (file)
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -42,7 +42,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  * Portions taken from FreeBSD.
  *
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.121 2006/08/20 16:08:09 meskes Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.122 2006/09/14 23:21:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1214,10 +1214,10 @@ setup_config(void)
    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);
+   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 = 20000", repltok);
+   conflines = replace_token(conflines, "#max_fsm_pages = 1600000", repltok);
 
 #if DEF_PGPORT != 5432
    snprintf(repltok, sizeof(repltok), "#port = %d", DEF_PGPORT);