Remove postgresql.conf of 'info' as a valid client_min_messages level.

diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml
index 952351170cc2c3e161aedc866ccb507b84b0e37e..91eb0f2972799ca6e7ae351e0bfc07285e635bf5 100644 (file)
--- a/doc/src/sgml/plpgsql.sgml
+++ b/doc/src/sgml/plpgsql.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.39 2004/07/04 02:48:52 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.40 2004/07/11 21:48:24 momjian Exp $
 -->
 
 <chapter id="plpgsql"> 
@@ -2120,7 +2120,7 @@ RAISE <replaceable class="parameter">level</replaceable> '<replaceable class="pa
 </synopsis>
 
     Possible levels are <literal>DEBUG</literal>,
-    <literal>LOG</literal>, <literal>INFO</literal>,
+    <literal>LOG</literal>,
     <literal>NOTICE</literal>, <literal>WARNING</literal>,
     and <literal>EXCEPTION</literal>.
     <literal>EXCEPTION</literal> raises an error and aborts the current

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index e70d6836aa34063c1d979e0897641f6221b94013..91977650b785637bd0d5be965de82a7ab223171a 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.215 2004/07/11 21:34:00 momjian Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.216 2004/07/11 21:48:25 momjian Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -5210,6 +5210,10 @@ assign_msglvl(int *var, const char *newval, bool doit, GucSource source)
                if (doit)
                        (*var) = LOG;
        }
+       /*
+        *      Client_min_messages always prints 'info', but
+        *      we allow it as a value anyway.
+        */
        else if (pg_strcasecmp(newval, "info") == 0)
        {
                if (doit)

diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index bc772b2a7a1549587b5e6a408a4c88f212d91b31..dcfbdf92420f4965452c0c0cf094fe882d4d5f84 100644 (file)
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -167,7 +167,7 @@
 
 #client_min_messages = notice  # Values, in order of decreasing detail:
                                #   debug5, debug4, debug3, debug2, debug1,
-                               #   log, info, notice, warning, error
+                               #   log, notice, warning, error
 
 #log_min_messages = notice     # Values, in order of decreasing detail:
                                #   debug5, debug4, debug3, debug2, debug1,