aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2001-09-12 14:06:37 +0000
committerPeter Eisentraut <peter_e@gmx.net>2001-09-12 14:06:37 +0000
commitdfdbf6898f378420ef136daf3ce786b225dc9d5d (patch)
treeea8c834edfb3ef839d0fa0d79171bee933274640
parentdddd95a8590521ab0169f210a85fc87e0b5176a4 (diff)
downloadpostgresql-dfdbf6898f378420ef136daf3ce786b225dc9d5d.tar.gz
postgresql-dfdbf6898f378420ef136daf3ce786b225dc9d5d.zip
max_locks_per_transaction seems to be a more consistent name than
max_locks_per_xact.
-rw-r--r--doc/src/sgml/runtime.sgml6
-rw-r--r--src/backend/utils/misc/guc.c4
-rw-r--r--src/backend/utils/misc/postgresql.conf.sample2
3 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index be2ae89ade4..e08a3770b36 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.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 b1299df0673..5af9fc67ab2 100644
--- 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 2d5ac37cae6..8faf8304eba 100644
--- 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
#