postgres.git / summary / log / commit / refs

commit    47571ec1e46994265961b9ddfb83cccb340e4aec
Author:   Bruce Momjian <bruce@momjian.us>
Date:     Mon Oct 07 18:33:31 2019 +0000
First released in: 13.0, 9.4.25, 9.5.20, 9.6.16, 10.11, 11.6, 12.1

    doc:  move mention of log_min_error_statement in a better spot
    
    Previously it was mentioned in the lock_timeout docs in a confusing
    location.
    
    Reported-by: ivaylo.zlatanov@gmail.com
    
    Discussion: https://postgr.es/m/157019615723.25307.15449102262106437404@wrigleys.postgresql.org
    
    Backpatch-through: 9.4


 doc/src/sgml/config.sgml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 619ac8c50c8..1320875b5b8 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -7617,9 +7617,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
         each lock acquisition attempt.  The limit applies both to explicit
         locking requests (such as <command>LOCK TABLE</command>, or <command>SELECT
         FOR UPDATE</command> without <literal>NOWAIT</literal>) and to implicitly-acquired
-        locks.  If <varname>log_min_error_statement</varname> is set to
-        <literal>ERROR</literal> or lower, the statement that timed out will be
-        logged.  A value of zero (the default) turns this off.
+        locks.  A value of zero (the default) turns this off.
        </para>
 
        <para>
@@ -7627,7 +7625,9 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
         while waiting for locks.  Note that if <varname>statement_timeout</varname>
         is nonzero, it is rather pointless to set <varname>lock_timeout</varname> to
         the same or larger value, since the statement timeout would always
-        trigger first.
+        trigger first.  If <varname>log_min_error_statement</varname> is set to
+        <literal>ERROR</literal> or lower, the statement that timed out will be
+        logged.  
        </para>
 
        <para>


[parent: 3887e9455f81]