From 18baa9790e40b72786dfa58b7d50d1dae37961eb Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 27 Feb 2000 21:10:41 +0000
Subject: [PATCH] Looks like I broke SET variable = DEFAULT awhile ago.  Ooops.

---
 src/backend/commands/variable.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index ca3f96c063..81c1e10bbd 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.30 2000/02/19 22:10:44 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.31 2000/02/27 21:10:41 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -999,7 +999,10 @@ parse_pg_options(char *value)
 	if (!superuser()) {
 		elog(ERROR, "Only users with superuser privilege can set pg_options");
 	}
-	parse_options((char *) value, TRUE);
+	if (value == NULL)
+		read_pg_options(0);
+	else
+		parse_options((char *) value, TRUE);
 	return (TRUE);
 }
 
@@ -1112,6 +1115,9 @@ static struct VariableParsers
 };
 
 /*-----------------------------------------------------------------------*/
+/*
+ * Set the named variable, or reset to default value if value is NULL
+ */
 bool
 SetPGVariable(const char *name, const char *value)
 {
@@ -1119,7 +1125,7 @@ SetPGVariable(const char *name, const char *value)
 	char	   *val;
 
 	/* Make a modifiable copy for convenience of get_token */
-	val = pstrdup(value);
+	val = value ? pstrdup(value) : ((char *) NULL);
 
 	for (vp = VariableParsers; vp->name; vp++)
 	{
-- 
2.11.0