Commit fa6f9cea authored by Bruce Momjian's avatar Bruce Momjian

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

comment alignment on most systems.
parent 65ab9f4f
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
# - Memory - # - 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) # (change requires restart)
#temp_buffers = 1000 # min 100, 8kB each #temp_buffers = 1000 # min 100, 8kB each
#max_prepared_transactions = 5 # can be 0 or more #max_prepared_transactions = 5 # can be 0 or more
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
# - Free Space Map - # - 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) # (change requires restart)
#max_fsm_relations = 1000 # min 100, ~70 bytes each #max_fsm_relations = 1000 # min 100, ~70 bytes each
# (change requires restart) # (change requires restart)
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD. * 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) ...@@ -1214,10 +1214,10 @@ setup_config(void)
conflines = replace_token(conflines, "#max_connections = 100", repltok); conflines = replace_token(conflines, "#max_connections = 100", repltok);
snprintf(repltok, sizeof(repltok), "shared_buffers = %dkB", n_buffers); 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); 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 #if DEF_PGPORT != 5432
snprintf(repltok, sizeof(repltok), "#port = %d", DEF_PGPORT); snprintf(repltok, sizeof(repltok), "#port = %d", DEF_PGPORT);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment