]> granicus.if.org Git - postgresql/commitdiff
Fix recent guc comment-to-default patch for custom variables.
authorBruce Momjian <bruce@momjian.us>
Sun, 13 Aug 2006 15:37:02 +0000 (15:37 +0000)
committerBruce Momjian <bruce@momjian.us>
Sun, 13 Aug 2006 15:37:02 +0000 (15:37 +0000)
src/backend/utils/misc/guc.c

index caa4fc67a593a20ee10fb5067380d9123c1d5302..cda5a41142a212968df502dc31eb9d6e13f54d50 100644 (file)
@@ -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;
                }
        }