aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2001-09-07 00:46:42 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2001-09-07 00:46:42 +0000
commite67bb7af5a2e0f014fc69cd168954f022de90a51 (patch)
tree448221f1dd9675fca90fd430c61eb19c40dcf84f
parent4d8ce9bba3d74d7f4bafad6843c4afbfbfbed08c (diff)
downloadpostgresql-e67bb7af5a2e0f014fc69cd168954f022de90a51.tar.gz
postgresql-e67bb7af5a2e0f014fc69cd168954f022de90a51.zip
Missed a few places that referred to a compile-time limit on
max_connections.
-rw-r--r--doc/src/sgml/runtime.sgml10
-rw-r--r--src/backend/postmaster/postmaster.c8
-rw-r--r--src/backend/utils/misc/postgresql.conf.sample13
3 files changed, 11 insertions, 20 deletions
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 6e80adf00eb..1347e80eed6 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.75 2001/08/15 18:42:14 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.76 2001/09/07 00:46:41 tgl Exp $
-->
<Chapter Id="runtime">
@@ -1145,10 +1145,8 @@ dynamic_library_path = '/usr/local/lib:/home/my_project/lib:$libdir:$libdir/cont
<listitem>
<para>
Determines how many concurrent connections the database server
- will allow. The default is 32. There is also a compiled-in
- hard upper limit on this value, which is typically 1024
- (both numbers can be altered when compiling the server). This
- parameter can only be set at server start.
+ will allow. The default is 32 (unless altered while building
+ the server). This parameter can only be set at server start.
</para>
</listitem>
</varlistentry>
@@ -1760,7 +1758,7 @@ dynamic_library_path = '/usr/local/lib:/home/my_project/lib:$libdir:$libdir/cont
<productname>Postgres</> uses one semaphore per allowed connection
(<option>-N</> option), in sets of 16. Each such set will also
contain a 17th semaphore which contains a <quote>magic
- number</quote>, to avoid collision with semaphore sets used by
+ number</quote>, to detect collision with semaphore sets used by
other applications. The maximum number of semaphores in the system
is set by <varname>SEMMNS</>, which consequently must be at least
as high as the connection setting plus one extra for each 16
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 31521f5de43..5cdf81cd8fa 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.238 2001/09/07 00:27:29 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.239 2001/09/07 00:46:42 tgl Exp $
*
* NOTES
*
@@ -480,11 +480,7 @@ PostmasterMain(int argc, char *argv[])
*/
break;
case 'N':
-
- /*
- * The max number of backends to start. Can't set to less
- * than 1 or more than compiled-in limit.
- */
+ /* The max number of backends to start. */
SetConfigOption("max_connections", optarg, PGC_POSTMASTER, true);
break;
case 'n':
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index f1582d6bacb..2d5ac37cae6 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -7,17 +7,14 @@
# name = value
#
# (The `=' is optional.) White space is collapsed, comments are
-# introduced by `#' anywhere on a line. The complete list of option
+# introduced by `#' anywhere on a line. The complete list of option
# names and allowed values can be found in the PostgreSQL
-# documentation. Examples are:
-
-#log_connections = on
-#fsync = off
-#max_connections = 64
+# documentation. The commented-out settings shown in this file
+# represent the default values.
# Any option can also be given as a command line switch to the
# postmaster, e.g., 'postmaster -c log_connections=on'. Some options
-# can be set at run-time with the 'SET' SQL command.
+# can be changed at run-time with the 'SET' SQL command.
#========================================================================
@@ -29,7 +26,7 @@
#tcpip_socket = false
#ssl = false
-#max_connections = 32 # 1-1024
+#max_connections = 32
#port = 5432
#hostname_lookup = false