Fix recent guc comment-to-default patch for custom variables.

bmomjian · bmomjian · commit e0d6630bd857 · 2006-08-13T15:37:02.000Z
diff --git 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.339 2006/08/13 02:22:24 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.340 2006/08/13 15:37:02 momjian Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -4082,9 +4082,9 @@ verify_config_option(const char *name, const char *value,
 	if (parse_value(elevel, record, value, &source, false, NULL))
 	{
 		/*
-		 * Mark record like presented in the config file. Be carefull if
+		 * Mark record as present in the config file. Be carefull if
 		 * you use this function for another purpose than config file 
-		 * verification. It causes confusion configfile parser.
+		 * verification. It causes confusion in the config file parser.
 		 */
 		record->status |= GUC_IN_CONFFILE;
 
@@ -5512,7 +5512,10 @@ is_newvalue_equal(struct config_generic *record, const char *newvalue)
 		{
 			struct config_string *conf = (struct config_string *) record;
 
-			return strcmp(*conf->variable, newvalue) == 0;
+			if (!*conf->variable)	/* custom variable with no value yet */
+				return false;
+			else
+				return strcmp(*conf->variable, newvalue) == 0;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* Written by Peter Eisentraut <peter_e@gmx.net>.`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.339 2006/08/13 02:22:24 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.340 2006/08/13 15:37:02 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*--------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -4082,9 +4082,9 @@ verify_config_option(const char name, const char value,`
`4082`	`4082`	`if (parse_value(elevel, record, value, &source, false, NULL))`
`4083`	`4083`	`{`
`4084`	`4084`	`/*`
`4085`		`- * Mark record like presented in the config file. Be carefull if`
	`4085`	`+ * Mark record as present in the config file. Be carefull if`
`4086`	`4086`	`* you use this function for another purpose than config file`
`4087`		`- * verification. It causes confusion configfile parser.`
	`4087`	`+ * verification. It causes confusion in the config file parser.`
`4088`	`4088`	`*/`
`4089`	`4089`	`record->status \|= GUC_IN_CONFFILE;`
`4090`	`4090`
`@@ -5512,7 +5512,10 @@ is_newvalue_equal(struct config_generic record, const char newvalue)`
`5512`	`5512`	`{`
`5513`	`5513`	`struct config_string conf = (struct config_string ) record;`
`5514`	`5514`
`5515`		`- return strcmp(*conf->variable, newvalue) == 0;`
	`5515`	`+ if (!conf->variable) / custom variable with no value yet */`
	`5516`	`+ return false;`
	`5517`	`+ else`
	`5518`	`+ return strcmp(*conf->variable, newvalue) == 0;`
`5516`	`5519`	`}`
`5517`	`5520`	`}`
`5518`	`5521`