diff -r -c pgsql_1/src/backend/utils/misc/guc-file.l pgsql_2/src/backend/utils/misc/guc-file.l
*** pgsql_1/src/backend/utils/misc/guc-file.l	Wed Aug  2 13:35:27 2006
--- pgsql_2/src/backend/utils/misc/guc-file.l	Wed Aug  2 15:24:54 2006
***************
*** 117,122 ****
--- 117,123 ----
  {
  	int			elevel, i;
  	struct name_value_pair *item, *head, *tail;
+ 	char	   *env;
  	bool	   *apply_list = NULL;
  	int			varcount = 0;
  
***************
*** 183,189 ****
--- 184,242 ----
  			set_config_option(item->name, item->value, context,
  							  PGC_S_FILE, false, true);
  
+ 	if( context == PGC_SIGHUP)
+ 	{
+ 	/*
+ 	 * Revert all "untouched" options with reset source PGC_S_FILE to
+ 	 * default/boot value.
+ 	 */
+ 		for (i = 0; i < num_guc_variables; i++)
+ 		{
+ 			struct config_generic *gconf = guc_variables[i];
+ 			if ( gconf->reset_source == PGC_S_FILE &&
+ 				 !(gconf->status & GUC_IN_CONFFILE) )
+ 			{
+ 				if ( gconf->context == PGC_BACKEND && IsUnderPostmaster)
+ 					; /* Be silent. Does any body want message from each session? */
+ 				else if (gconf->context == PGC_POSTMASTER)
+ 					ereport(elevel,
+ 						(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),
+ 						errmsg("parameter \"%s\" cannot be changed (commented) after server start; configuration file change ignored",
+ 						gconf->name)));
+ 				else if(set_config_option(gconf->name,
+ 														NULL, context,
+ 														PGC_S_FILE,
+ 														false, true))
+ 				{
+ 					GucStack   *stack;
+ 					/* set correctly source */
+ 					gconf->reset_source = PGC_S_DEFAULT;
+ 					for (stack = gconf->stack; stack; stack = stack->prev)
+ 						if (stack->source == PGC_S_FILE)
+ 							stack->source = PGC_S_DEFAULT;
  
+ 						ereport(elevel,
+ 								(errcode(ERRCODE_SUCCESSFUL_COMPLETION),
+ 								errmsg("configuration option %s falls back to default value", gconf->name)));
+ 				}
+ 			}
+ 			gconf->status &= ~GUC_IN_CONFFILE;
+ 		}
+ 
+ 		/* Revert to environment variable. PGPORT is ignored, because it cannot be
+ 		 * set in running state.
+ 		 */
+ 		env = getenv("PGDATESTYLE");
+ 		if (env != NULL)
+ 			set_config_option("datestyle", env, context,
+ 							  PGC_S_ENV_VAR, false, true);
+ 
+ 		env = getenv("PGCLIENTENCODING");
+ 		if (env != NULL)
+ 			set_config_option("client_encoding", env, context,
+ 							PGC_S_ENV_VAR, false, true);
+ 	}
+ 
  cleanup_list:
  	if (apply_list)
  		pfree(apply_list);
diff -r -c pgsql_1/src/backend/utils/misc/guc.c pgsql_2/src/backend/utils/misc/guc.c
*** pgsql_1/src/backend/utils/misc/guc.c	Wed Aug  2 14:32:14 2006
--- pgsql_2/src/backend/utils/misc/guc.c	Wed Aug  2 15:25:00 2006
***************
*** 2694,2704 ****
  					struct config_bool *conf = (struct config_bool *) gconf;
  
  					if (conf->assign_hook)
! 						if (!(*conf->assign_hook) (conf->reset_val, true,
  												   PGC_S_DEFAULT))
  							elog(FATAL, "failed to initialize %s to %d",
! 								 conf->gen.name, (int) conf->reset_val);
! 					*conf->variable = conf->reset_val;
  					break;
  				}
  			case PGC_INT:
--- 2694,2704 ----
  					struct config_bool *conf = (struct config_bool *) gconf;
  
  					if (conf->assign_hook)
! 						if (!(*conf->assign_hook) (conf->boot_val, true,
  												   PGC_S_DEFAULT))
  							elog(FATAL, "failed to initialize %s to %d",
! 								 conf->gen.name, (int) conf->boot_val);
! 					*conf->variable = conf->reset_val = conf->boot_val;
  					break;
  				}
  			case PGC_INT:
***************
*** 2705,2718 ****
  				{
  					struct config_int *conf = (struct config_int *) gconf;
  
! 					Assert(conf->reset_val >= conf->min);
! 					Assert(conf->reset_val <= conf->max);
  					if (conf->assign_hook)
! 						if (!(*conf->assign_hook) (conf->reset_val, true,
  												   PGC_S_DEFAULT))
  							elog(FATAL, "failed to initialize %s to %d",
! 								 conf->gen.name, conf->reset_val);
! 					*conf->variable = conf->reset_val;
  					break;
  				}
  			case PGC_REAL:
--- 2705,2718 ----
  				{
  					struct config_int *conf = (struct config_int *) gconf;
  
! 					Assert(conf->boot_val >= conf->min);
! 					Assert(conf->boot_val <= conf->max);
  					if (conf->assign_hook)
! 						if (!(*conf->assign_hook) (conf->boot_val, true,
  												   PGC_S_DEFAULT))
  							elog(FATAL, "failed to initialize %s to %d",
! 								 conf->gen.name, conf->boot_val);
! 					*conf->variable = conf->reset_val = conf->boot_val; 
  					break;
  				}
  			case PGC_REAL:
***************
*** 2719,2732 ****
  				{
  					struct config_real *conf = (struct config_real *) gconf;
  
! 					Assert(conf->reset_val >= conf->min);
! 					Assert(conf->reset_val <= conf->max);
  					if (conf->assign_hook)
! 						if (!(*conf->assign_hook) (conf->reset_val, true,
  												   PGC_S_DEFAULT))
  							elog(FATAL, "failed to initialize %s to %g",
! 								 conf->gen.name, conf->reset_val);
! 					*conf->variable = conf->reset_val;
  					break;
  				}
  			case PGC_STRING:
--- 2719,2732 ----
  				{
  					struct config_real *conf = (struct config_real *) gconf;
  
! 					Assert(conf->boot_val >= conf->min);
! 					Assert(conf->boot_val <= conf->max);
  					if (conf->assign_hook)
! 						if (!(*conf->assign_hook) (conf->boot_val, true,
  												   PGC_S_DEFAULT))
  							elog(FATAL, "failed to initialize %s to %g",
! 								 conf->gen.name, conf->boot_val);
! 					*conf->variable = conf->reset_val = conf->boot_val; 
  					break;
  				}
  			case PGC_STRING:
***************
*** 3179,3185 ****
  	for (i = 0; i < num_guc_variables; i++)
  	{
  		struct config_generic *gconf = guc_variables[i];
! 		int			my_status = gconf->status;
  		GucStack   *stack = gconf->stack;
  		bool		useTentative;
  		bool		changed;
--- 3179,3185 ----
  	for (i = 0; i < num_guc_variables; i++)
  	{
  		struct config_generic *gconf = guc_variables[i];
! 		int			my_status = gconf->status & (~GUC_IN_CONFFILE);
  		GucStack   *stack = gconf->stack;
  		bool		useTentative;
  		bool		changed;
***************
*** 3726,3733 ****
  				}
  				else
  				{
! 					newval = conf->reset_val;
! 					*source = conf->gen.reset_source;
  				}
  
  				if (conf->assign_hook)
--- 3726,3744 ----
  				}
  				else
  				{
! 					/* Revert value to default if source is configuration file. It is used when 
! 					 * configuration parameter is removed/commented out in the config file. Else
! 					 * RESET or SET TO DEFAULT command is called and reset_val is used. 
! 					 */
! 					if( *source == PGC_S_FILE )
! 					{
! 						newval =  conf->boot_val;
! 					}
! 					else
! 					{
! 						newval = conf->reset_val;
! 						*source = conf->gen.reset_source;
! 					}
  				}
  
  				if (conf->assign_hook)
***************
*** 3770,3777 ****
  				}
  				else
  				{
! 					newval = conf->reset_val;
! 					*source = conf->gen.reset_source;
  				}
  
  				if (conf->assign_hook)
--- 3781,3799 ----
  				}
  				else
  				{
! 					/* Revert value to default if source is configuration file. It is used when 
! 					 * configuration parameter is removed/commented out in the config file. Else
! 					 * RESET or SET TO DEFAULT command is called and reset_val is used. 
! 					 */
! 					if( *source == PGC_S_FILE )
! 					{
! 						newval =  conf->boot_val;
! 					}
! 					else
! 					{
! 						newval = conf->reset_val;
! 						*source = conf->gen.reset_source;
! 					}
  				}
  
  				if (conf->assign_hook)
***************
*** 3814,3821 ****
  				}
  				else
  				{
! 					newval = conf->reset_val;
! 					*source = conf->gen.reset_source;
  				}
  
  				if (conf->assign_hook)
--- 3836,3854 ----
  				}
  				else
  				{
! 					/* Revert value to default if source is configuration file. It is used when 
! 					 * configuration parameter is removed/commented out in the config file. Else
! 					 * RESET or SET TO DEFAULT command is called and reset_val is used. 
! 					 */
! 					if( *source == PGC_S_FILE )
! 					{
! 						newval =  conf->boot_val;
! 					}
! 					else
! 					{
! 						newval = conf->reset_val;
! 						*source = conf->gen.reset_source;
! 					}
  				}
  
  				if (conf->assign_hook)
***************
*** 3849,3854 ****
--- 3882,3901 ----
  					if (conf->gen.flags & GUC_IS_NAME)
  						truncate_identifier(newval, strlen(newval), true);
  				}
+ 				else if (*source == PGC_S_FILE)
+ 				{
+ 					/* Revert value to default when item is removed from config file. */
+ 					if ( conf->boot_val != NULL )
+ 					{
+ 						newval = guc_strdup(elevel, conf->boot_val);
+ 						if (newval == NULL)
+ 							return false;
+ 					}
+ 					else
+ 					{
+ 						return false;
+ 					}
+ 				} 
  				else if (conf->reset_val)
  				{
  					/*
***************
*** 4053,4058 ****
--- 4100,4110 ----
  
  	if( parse_value(elevel, record, value, &source, false,  &newval) )
  	{
+ 		/* Mark record like presented in the config file. Be carefull if
+ 		 * you use this function for another purpose than config file 
+          * verification. It causes confusion configfile parser. */
+ 		record->status |= GUC_IN_CONFFILE;
+ 
  		if( isNewEqual != NULL)
  			*isNewEqual = is_newvalue_equal(record, value);
  		if( isContextOK != NULL)
***************
*** 4115,4121 ****
  	 * Should we set reset/stacked values?	(If so, the behavior is not
  	 * transactional.)
  	 */
! 	makeDefault = changeVal && (source <= PGC_S_OVERRIDE) && (value != NULL);
  
  	/*
  	 * Ignore attempted set if overridden by previously processed setting.
--- 4167,4173 ----
  	 * Should we set reset/stacked values?	(If so, the behavior is not
  	 * transactional.)
  	 */
! 	makeDefault = changeVal && (source <= PGC_S_OVERRIDE) && (value != NULL || source == PGC_S_FILE);
  
  	/*
  	 * Ignore attempted set if overridden by previously processed setting.
diff -r -c pgsql_1/src/include/utils/guc_tables.h pgsql_2/src/include/utils/guc_tables.h
*** pgsql_1/src/include/utils/guc_tables.h	Thu Jul 27 10:30:41 2006
--- pgsql_2/src/include/utils/guc_tables.h	Wed Aug  2 15:31:09 2006
***************
*** 143,150 ****
  #define GUC_HAVE_TENTATIVE	0x0001		/* tentative value is defined */
  #define GUC_HAVE_LOCAL		0x0002		/* a SET LOCAL has been executed */
  #define GUC_HAVE_STACK		0x0004		/* we have stacked prior value(s) */
  
- 
  /* GUC records for specific variable types */
  
  struct config_bool
--- 143,151 ----
  #define GUC_HAVE_TENTATIVE	0x0001		/* tentative value is defined */
  #define GUC_HAVE_LOCAL		0x0002		/* a SET LOCAL has been executed */
  #define GUC_HAVE_STACK		0x0004		/* we have stacked prior value(s) */
+ #define GUC_IN_CONFFILE		0x0008		/* value shows up in the configuration
+ 										   file (is not commented) */
  
  /* GUC records for specific variable types */
  
  struct config_bool
***************
*** 153,163 ****
  	/* these fields must be set correctly in initial value: */
  	/* (all but reset_val are constants) */
  	bool	   *variable;
! 	bool		reset_val;
  	GucBoolAssignHook assign_hook;
  	GucShowHook show_hook;
  	/* variable fields, initialized at runtime: */
  	bool		tentative_val;
  };
  
  struct config_int
--- 154,165 ----
  	/* these fields must be set correctly in initial value: */
  	/* (all but reset_val are constants) */
  	bool	   *variable;
! 	bool		boot_val;
  	GucBoolAssignHook assign_hook;
  	GucShowHook show_hook;
  	/* variable fields, initialized at runtime: */
  	bool		tentative_val;
+ 	bool		reset_val;
  };
  
  struct config_int
***************
*** 166,172 ****
  	/* these fields must be set correctly in initial value: */
  	/* (all but reset_val are constants) */
  	int		   *variable;
! 	int			reset_val;
  	int			min;
  	int			max;
  	GucIntAssignHook assign_hook;
--- 168,174 ----
  	/* these fields must be set correctly in initial value: */
  	/* (all but reset_val are constants) */
  	int		   *variable;
! 	int			boot_val;
  	int			min;
  	int			max;
  	GucIntAssignHook assign_hook;
***************
*** 173,178 ****
--- 175,181 ----
  	GucShowHook show_hook;
  	/* variable fields, initialized at runtime: */
  	int			tentative_val;
+ 	int			reset_val;
  };
  
  struct config_real
***************
*** 181,187 ****
  	/* these fields must be set correctly in initial value: */
  	/* (all but reset_val are constants) */
  	double	   *variable;
! 	double		reset_val;
  	double		min;
  	double		max;
  	GucRealAssignHook assign_hook;
--- 184,190 ----
  	/* these fields must be set correctly in initial value: */
  	/* (all but reset_val are constants) */
  	double	   *variable;
! 	double		boot_val;
  	double		min;
  	double		max;
  	GucRealAssignHook assign_hook;
***************
*** 188,193 ****
--- 191,197 ----
  	GucShowHook show_hook;
  	/* variable fields, initialized at runtime: */
  	double		tentative_val;
+   	double		reset_val;
  };
  
  struct config_string
