max_locks_per_transaction seems to be a more consistent name than

max_locks_per_xact.

diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index be2ae89ade43ea0fbbb0b2c3a9f9eb1c2306781f..e08a3770b36b42c89f881b1438b72d0325e6f041 100644 (file)
--- 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.77 2001/09/09 23:52:12 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.78 2001/09/12 14:06:37 petere Exp $
 -->
 
 <Chapter Id="runtime">
@@ -1187,11 +1187,11 @@ dynamic_library_path = '/usr/local/lib:/home/my_project/lib:$libdir:$libdir/cont
      </varlistentry>
 
      <varlistentry>
-      <term><varname>MAX_LOCKS_PER_XACT</varname> (<type>integer</type>)</term>
+      <term><varname>MAX_LOCKS_PER_TRANSACTION</varname> (<type>integer</type>)</term>
       <listitem>
        <para>
         The shared lock table is sized on the assumption that at most
-       <varname>max_locks_per_xact</> * <varname>max_connections</varname> distinct objects will need
+       <varname>max_locks_per_transaction</> * <varname>max_connections</varname> distinct objects will need
        to be locked at any one time.  The default, 64, has historically
        proven sufficient, but you might need to raise this value if you
        have clients that touch many different tables in a single transaction.

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index b1299df06730fea4e78a30fc5aa9364c40a199fc..5af9fc67ab27c16e00da4f7def480c51f3de3633 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -4,7 +4,7 @@
  * Support for grand unified configuration scheme, including SET
  * command, configuration file, and command line options.
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.47 2001/09/07 00:27:29 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.48 2001/09/12 14:06:37 petere Exp $
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  * Written by Peter Eisentraut <peter_e@gmx.net>.
@@ -317,7 +317,7 @@ static struct config_int
        {"max_fsm_pages", PGC_POSTMASTER, &MaxFSMPages,
         10000, 1000, INT_MAX, NULL, NULL},
 
-       {"max_locks_per_xact", PGC_POSTMASTER, &max_locks_per_xact,
+       {"max_locks_per_transaction", PGC_POSTMASTER, &max_locks_per_xact,
         64, 10, INT_MAX, NULL, NULL},
 
        {"checkpoint_segments", PGC_SIGHUP, &CheckPointSegments,

diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 2d5ac37cae674df7641df391c7b28c3f6f81e0cf..8faf8304ebadb2331f17466dddc4c6fc97ea4906 100644 (file)
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -47,7 +47,7 @@
 #shared_buffers = 64        # 2*max_connections, min 16
 #max_fsm_relations = 100    # min 10
 #max_fsm_pages = 10000      # min 1000
-#max_locks_per_xact = 64    # min 10
+#max_locks_per_transaction = 64 # min 10
 #wal_buffers = 8            # min 4
 
 #