aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backend/utils/misc/guc.c6
-rw-r--r--src/backend/utils/misc/postgresql.conf.sample5
2 files changed, 6 insertions, 5 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 5bbf89da5bd..1a7eda066e3 100644
--- 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.358 2006/11/05 22:42:09 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.359 2006/11/21 01:23:37 tgl Exp $
*
*--------------------------------------------------------------------
*/
@@ -176,7 +176,7 @@ bool SQL_inheritance = true;
bool Password_encryption = true;
-int log_min_error_statement = PANIC;
+int log_min_error_statement = ERROR;
int log_min_messages = NOTICE;
int client_min_messages = NOTICE;
int log_min_duration_statement = -1;
@@ -1853,7 +1853,7 @@ static struct config_string ConfigureNamesString[] =
"specified level or a higher level are logged.")
},
&log_min_error_statement_str,
- "panic", assign_min_error_statement, NULL
+ "error", assign_min_error_statement, NULL
},
{
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 3a0dedba672..196cae54a36 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -284,7 +284,7 @@
#log_error_verbosity = default # terse, default, or verbose messages
-#log_min_error_statement = panic # Values in order of increasing severity:
+#log_min_error_statement = error # Values in order of increasing severity:
# debug5
# debug4
# debug3
@@ -294,7 +294,8 @@
# notice
# warning
# error
- # panic(off)
+ # fatal
+ # panic (effectively off)
#log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements
# and their durations.