diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml
index 80764df092e8aa190767621b6c8585df6ecce665..f16ba97da6cbc03b09468354085425fb14b90e01 100644
--- a/doc/src/sgml/plpgsql.sgml
+++ b/doc/src/sgml/plpgsql.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/plpgsql.sgml,v 1.9 2002/11/10 00:35:58 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/plpgsql.sgml,v 1.10 2002/11/14 23:53:26 momjian Exp $
-->
<chapter id="plpgsql">
@@ -1900,7 +1900,7 @@ RAISE <replaceable class="parameter">level</replaceable> '<replaceable class="pa
(raise an error and abort the current transaction). Whether error
messages of a particular priority are reported to the client,
written to the server log, or both is controlled by the
- <option>SERVER_MIN_MESSAGES</option> and
+ <option>LOG_MIN_MESSAGES</option> and
<option>CLIENT_MIN_MESSAGES</option> configuration variables. See
the <citetitle>PostgreSQL Administrator's Guide</citetitle> for more
information.
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 0f8ca84094ce7945d3312ed85115d426c7ed172c..38115cba24bfbd1c29ef9562428b59b4e7bb6cde 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.150 2002/11/11 20:14:03 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.151 2002/11/14 23:53:26 momjian Exp $
-->
<Chapter Id="runtime">
@@ -854,18 +854,17 @@ env PGOPTIONS='-c geqo=off' psql
<para>
<variablelist>
<varlistentry>
- <term><varname>SERVER_MIN_MESSAGES</varname> (<type>string</type>)</term>
+ <term><varname>CLIENT_MIN_MESSAGES</varname> (<type>string</type>)</term>
<listitem>
<para>
- This controls how much message detail is written to the server
- logs. Valid values are <literal>DEBUG5</>,
+ This controls how much message detail is written to the
+ client. Valid values are <literal>DEBUG5</>,
<literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
- <literal>DEBUG1</>, <literal>INFO</>, <literal>NOTICE</>,
- <literal>WARNING</>, <literal>ERROR</>, <literal>LOG</>,
- <literal>FATAL</>, and <literal>PANIC</>. Later values send
- less detail to the logs. The default is <literal>NOTICE</>.
- Note that <literal>LOG</> has a different precedence here than
- in <literal>CLIENT_MIN_MESSAGES</>.
+ <literal>DEBUG1</>, <literal>LOG</>, <literal>NOTICE</>,
+ <literal>WARNING</>, and <literal>ERROR</>. Later values send
+ less information to the client. The default is
+ <literal>NOTICE</>. Note that <literal>LOG</> has a different
+ precedence here than in <literal>LOG_MIN_MESSAGES</>.
</para>
<para>
@@ -952,23 +951,6 @@ env PGOPTIONS='-c geqo=off' psql
</listitem>
</varlistentry>
- <varlistentry>
- <term><varname>CLIENT_MIN_MESSAGES</varname> (<type>string</type>)</term>
- <listitem>
- <para>
- This controls how much message detail is written to the
- client. Valid values are <literal>DEBUG5</>,
- <literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
- <literal>DEBUG1</>, <literal>LOG</>, <literal>NOTICE</>,
- <literal>WARNING</>, and <literal>ERROR</>. Later values send
- less information to the client. The default is
- <literal>NOTICE</>. Note that <literal>LOG</> has a different
- precedence here than in <literal>SERVER_MIN_MESSAGES</>. Also
- see that section for an explanation of the various values.
- </para>
- </listitem>
- </varlistentry>
-
<varlistentry>
<term><varname>DEBUG_ASSERTIONS</varname> (<type>boolean</type>)</term>
<listitem>
@@ -1076,6 +1058,25 @@ env PGOPTIONS='-c geqo=off' psql
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><varname>LOG_MIN_MESSAGES</varname> (<type>string</type>)</term>
+ <listitem>
+ <para>
+ This controls how much message detail is written to the server
+ logs. Valid values are <literal>DEBUG5</>,
+ <literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
+ <literal>DEBUG1</>, <literal>INFO</>, <literal>NOTICE</>,
+ <literal>WARNING</>, <literal>ERROR</>, <literal>LOG</>,
+ <literal>FATAL</>, and <literal>PANIC</>. Later values send
+ less detail to the logs. The default is <literal>NOTICE</>.
+ Note that <literal>LOG</> has a different precedence here than
+ in <literal>CLIENT_MIN_MESSAGES</>. Also see that section
+ for an explanation of the various values.
+ </para>
+
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term><varname>LOG_PID</varname> (<type>boolean</type>)</term>
<listitem>
@@ -2177,7 +2178,7 @@ dynamic_library_path = '/usr/local/lib/postgresql:/home/my_project/lib:$libdir'
</row>
<row>
<entry><option>-d <replaceable>x</replaceable></option></entry>
- <entry><literal>server_min_messages = DEBUG<replaceable>x</replaceable></></entry>
+ <entry><literal>log_min_messages = DEBUG<replaceable>x</replaceable></></entry>
</row>
<row>
<entry><option>-F</option></entry>
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index a2b26bcdb00d506de0fd0057a405db3d2b4cf410..b1eb7eb21a874ef7c4e013ae400f7e3e003ce2ae 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.144 2002/09/26 22:58:33 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.145 2002/11/14 23:53:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -263,7 +263,7 @@ BootstrapMain(int argc, char *argv[])
char *debugstr = palloc(strlen("debug") + strlen(optarg) + 1);
sprintf(debugstr, "debug%s", optarg);
- SetConfigOption("server_min_messages", debugstr,
+ SetConfigOption("log_min_messages", debugstr,
PGC_POSTMASTER, PGC_S_ARGV);
SetConfigOption("client_min_messages", debugstr,
PGC_POSTMASTER, PGC_S_ARGV);
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 7f3680200762be00fd67ec2efd983876fea8bb4e..69363cd8f76c5fcddc7f0424db390e6108555c75 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.293 2002/11/13 00:39:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.294 2002/11/14 23:53:27 momjian Exp $
*
* NOTES
*
@@ -451,7 +451,7 @@ PostmasterMain(int argc, char *argv[])
char *debugstr = palloc(strlen("debug") + strlen(optarg) + 1);
sprintf(debugstr, "debug%s", optarg);
- SetConfigOption("server_min_messages", debugstr,
+ SetConfigOption("log_min_messages", debugstr,
PGC_POSTMASTER, PGC_S_ARGV);
pfree(debugstr);
debug_flag = atoi(optarg);
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 82eebee4fa87fcf93a252d1648e49e1b2e80e949..0a69c3bb7da69cf1c68e71b0e6165cdf15012be9 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.307 2002/10/31 21:34:16 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.308 2002/11/14 23:53:27 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -1339,7 +1339,7 @@ PostgresMain(int argc, char *argv[], const char *username)
char *debugstr = palloc(strlen("debug") + strlen(optarg) + 1);
sprintf(debugstr, "debug%s", optarg);
- SetConfigOption("server_min_messages", debugstr, ctx, gucsource);
+ SetConfigOption("log_min_messages", debugstr, ctx, gucsource);
pfree(debugstr);
}
@@ -1349,7 +1349,7 @@ PostgresMain(int argc, char *argv[], const char *username)
* from propagating to backend. It would be nice
* to set it to the postgresql.conf value here.
*/
- SetConfigOption("server_min_messages", "notice",
+ SetConfigOption("log_min_messages", "notice",
ctx, gucsource);
}
break;
@@ -1590,7 +1590,7 @@ PostgresMain(int argc, char *argv[], const char *username)
/*
* -d is not the same as setting
- * server_min_messages because it enables other
+ * log_min_messages because it enables other
* output options.
*/
if (debug_flag >= 1)
@@ -1781,7 +1781,7 @@ PostgresMain(int argc, char *argv[], const char *username)
if (!IsUnderPostmaster)
{
puts("\nPOSTGRES backend interactive interface ");
- puts("$Revision: 1.307 $ $Date: 2002/10/31 21:34:16 $\n");
+ puts("$Revision: 1.308 $ $Date: 2002/11/14 23:53:27 $\n");
}
/*
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 66c17e2e8cc28cfa2b7638bd6e96de3af926db81..94abd521b6116081b96d8500844ca4ba4a799d96 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.104 2002/11/01 17:55:23 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.105 2002/11/14 23:53:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -148,21 +148,21 @@ elog(int lev, const char *fmt,...)
/* Complicated because LOG is sorted out-of-order for this purpose */
if (lev == LOG || lev == COMMERROR)
{
- if (server_min_messages == LOG)
+ if (log_min_messages == LOG)
output_to_server = true;
- else if (server_min_messages < FATAL)
+ else if (log_min_messages < FATAL)
output_to_server = true;
}
else
{
/* lev != LOG */
- if (server_min_messages == LOG)
+ if (log_min_messages == LOG)
{
if (lev >= FATAL)
output_to_server = true;
}
/* Neither is LOG */
- else if (lev >= server_min_messages)
+ else if (lev >= log_min_messages)
output_to_server = true;
}
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index ac1c97fedffdf71b397cde7b9ce7a24289d1e492..8802e5fbdcefdd30eb5a9658a63895d3a8a6f291 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -5,7 +5,7 @@
* command, configuration file, and command line options.
* See src/backend/utils/misc/README for more information.
*
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.100 2002/11/08 17:37:52 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.101 2002/11/14 23:53:27 momjian Exp $
*
* Copyright 2000 by PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>.
@@ -105,9 +105,9 @@ int log_min_error_statement = ERROR;
char *log_min_error_statement_str = NULL;
const char log_min_error_statement_str_default[] = "panic";
-int server_min_messages = NOTICE;
-char *server_min_messages_str = NULL;
-const char server_min_messages_str_default[] = "notice";
+int log_min_messages = NOTICE;
+char *log_min_messages_str = NULL;
+const char log_min_messages_str_default[] = "notice";
int client_min_messages = NOTICE;
char *client_min_messages_str = NULL;
@@ -805,8 +805,8 @@ static struct config_string
},
{
- {"server_min_messages", PGC_USERSET}, &server_min_messages_str,
- server_min_messages_str_default, assign_server_min_messages, NULL
+ {"log_min_messages", PGC_USERSET}, &log_min_messages_str,
+ log_min_messages_str_default, assign_log_min_messages, NULL
},
{
@@ -2927,10 +2927,10 @@ GUCArrayDelete(ArrayType *array, const char *name)
}
const char *
-assign_server_min_messages(const char *newval,
+assign_log_min_messages(const char *newval,
bool doit, bool interactive)
{
- return (assign_msglvl(&server_min_messages, newval, doit, interactive));
+ return (assign_msglvl(&log_min_messages, newval, doit, interactive));
}
const char *
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index ee721a358a81fad489c739434483bc2ac0386339..ff72af3c25923cedbbe5174fd96fbd06fb1eea86 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -112,7 +112,7 @@
#
# Message display
#
-#server_min_messages = notice # Values, in order of decreasing detail:
+#log_min_messages = notice # Values, in order of decreasing detail:
# debug5, debug4, debug3, debug2, debug1,
# info, notice, warning, error, log, fatal,
# panic
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 4b3e4c13a9b38afeb5b4723c18fead895dda0b74..3c65195de77456f5074df4e9aee78dd23e519603 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -3,7 +3,7 @@
*
* Copyright 2000-2002 by PostgreSQL Global Development Group
*
- * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.65 2002/11/08 17:37:52 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.66 2002/11/14 23:53:27 momjian Exp $
*/
/*----------------------------------------------------------------------
@@ -229,7 +229,7 @@ psql_completion(char *text, int start, int end)
"enable_hashjoin",
"geqo",
"fsync",
- "server_min_messages",
+ "log_min_messages",
"client_min_messages",
"debug_assertions",
"log_statement",
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index 48221bded3138208f4cf202daef5360c571e8724..e891580e32b58f131584c5c4cf0d4398cd7821e4 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -4,7 +4,7 @@
* External declarations pertaining to backend/utils/misc/guc.c and
* backend/utils/misc/guc-file.l
*
- * $Id: guc.h,v 1.24 2002/10/21 18:57:35 petere Exp $
+ * $Id: guc.h,v 1.25 2002/11/14 23:53:27 momjian Exp $
*/
#ifndef GUC_H
#define GUC_H
@@ -103,7 +103,7 @@ extern ArrayType *GUCArrayDelete(ArrayType *array, const char *name);
extern const char *assign_min_error_statement(const char *newval, bool doit,
bool interactive);
-extern const char *assign_server_min_messages(const char *newval,
+extern const char *assign_log_min_messages(const char *newval,
bool doit, bool interactive);
extern const char *assign_client_min_messages(const char *newval,
bool doit, bool interactive);
@@ -129,9 +129,9 @@ extern int log_min_error_statement;
extern char *log_min_error_statement_str;
extern const char log_min_error_statement_str_default[];
-extern int server_min_messages;
-extern char *server_min_messages_str;
-extern const char server_min_messages_str_default[];
+extern int log_min_messages;
+extern char *log_min_messages_str;
+extern const char log_min_messages_str_default[];
extern int client_min_messages;
extern char *client_min_messages_str;