Minor editorial improvements in documentation of session_replication_role;

in particular correct the obsolete claim that it can't be changed once
any plans have been cached.

diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index a64dabfd058351bc57c4b3ab104ff21c18735f2b..30ca1c219c94232c13d2440806b1258225c4d9c1 100644 (file)
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.161 2008/01/21 03:28:42 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.162 2008/01/27 19:12:28 tgl Exp $ -->
 
 <chapter Id="runtime-config">
   <title>Server Configuration</title>
@@ -3841,6 +3841,24 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       </listitem>
      </varlistentry>
 
+     <varlistentry id="guc-session-replication-role" xreflabel="session_replication_role">
+      <term><varname>session_replication_role</varname> (<type>string</type>)</term>
+      <indexterm>
+       <primary><varname>session_replication_role</> configuration parameter</primary>
+      </indexterm>
+      <listitem>
+       <para>
+        Controls firing of replication-related triggers and rules for the
+        current session.  Setting this variable requires
+        superuser privilege and results in discarding any previously cached
+        query plans.  Possible values are <literal>origin</> (the default),
+        <literal>replica</> and <literal>local</>.
+        See <xref linkend="sql-altertable" endterm="sql-altertable-title"> for
+        more information.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry id="guc-statement-timeout" xreflabel="statement_timeout">
       <term><varname>statement_timeout</varname> (<type>integer</type>)</term>
       <indexterm>
@@ -3858,23 +3876,6 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       </listitem>
      </varlistentry>
 
-     <varlistentry id="guc-session-replication-role" xreflabel="session_replication_role">
-      <term><varname>session_replication_role</varname> (<type>string</type>)</term>
-      <indexterm>
-       <primary><varname>session_replication_role</> configuration parameter</primary>
-      </indexterm>
-      <listitem>
-       <para>
-        Controls the trigger and rule firing for the current session.
-        See <xref linkend="sql-altertable" endterm="sql-altertable-title"> for the different options to
-        enable or disable triggers and rules. Setting the variable requires
-        superuser privilege and can only be done before any query plans have
-        been cached. Possible values are <literal>origin</>,
-        <literal>replica</> and <literal>local</>.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry id="guc-vacuum-freeze-min-age" xreflabel="vacuum_freeze_min_age">
       <term><varname>vacuum_freeze_min_age</varname> (<type>integer</type>)</term>
       <indexterm>

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 8e5667ffb772eb654a5ce7507b7ad70a72f4fb72..e3e04f4d3418244fe6cf036978062aa937214035 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.430 2008/01/14 19:18:53 tgl Exp $
+ *   $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.431 2008/01/27 19:12:28 tgl Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -2022,7 +2022,7 @@ static struct config_string ConfigureNamesString[] =
 
    {
        {"session_replication_role", PGC_SUSET, CLIENT_CONN_STATEMENT,
-           gettext_noop("Sets the sessions behavior for triggers and rewrite rules."),
+           gettext_noop("Sets the session's behavior for triggers and rewrite rules."),
            gettext_noop("Each session can be either"
                         " \"origin\", \"replica\", or \"local\".")
        },

diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 022ffe57ae859cc258a68d211bcb5ae632e07731..d9b9532395ea9c287cf6f22a6816f138e1c637d3 100644 (file)
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -414,8 +414,8 @@
 #check_function_bodies = on
 #default_transaction_isolation = 'read committed'
 #default_transaction_read_only = off
+#session_replication_role = 'origin'
 #statement_timeout = 0         # 0 is disabled
-#session_replication_role = "origin"
 #vacuum_freeze_min_age = 100000000
 #xmlbinary = 'base64'
 #xmloption = 'content'