summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane2002-09-12 14:03:45 +0000
committerTom Lane2002-09-12 14:03:45 +0000
commit2b0319869a2230c675752f92bbf2c43e9e5543e3 (patch)
tree5c6f2cac80dee333534c947b7228f2af1e91eeaa /src
parent7184a428a2f8d78b3165f7939e3f44ade01a90f2 (diff)
Avoid misleading error message when SET/RESET target variable name
doesn't match any known variable.
Diffstat (limited to 'src')
-rw-r--r--src/backend/utils/misc/guc.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 12504cb0b88..426cfa5dbbf 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.94 2002/09/10 16:09:02 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.95 2002/09/12 14:03:45 tgl Exp $
*
* Copyright 2000 by PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>.
@@ -2123,15 +2123,19 @@ flatten_set_variable_args(const char *name, List *args)
StringInfoData buf;
List *l;
- /* Fast path if just DEFAULT */
+ /*
+ * Fast path if just DEFAULT. We do not check the variable name in
+ * this case --- necessary for RESET ALL to work correctly.
+ */
if (args == NIL)
return NULL;
+ /* Else get flags for the variable */
record = find_option(name);
if (record == NULL)
- flags = 0; /* default assumptions */
- else
- flags = record->flags;
+ elog(ERROR, "'%s' is not a valid option name", name);
+
+ flags = record->flags;
/* Complain if list input and non-list variable */
if ((flags & GUC_LIST_INPUT) == 0 &&