*** pgsql/src/backend/utils/misc/guc.c	2009/01/03 20:03:08	1.488
--- pgsql/src/backend/utils/misc/guc.c	2009/01/05 13:23:33	1.489
***************
*** 10,16 ****
   * Written by Peter Eisentraut <peter_e@gmx.net>.
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.487 2009/01/02 10:33:20 mha Exp $
   *
   *--------------------------------------------------------------------
   */
--- 10,16 ----
   * Written by Peter Eisentraut <peter_e@gmx.net>.
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.488 2009/01/03 20:03:08 tgl Exp $
   *
   *--------------------------------------------------------------------
   */
*************** define_custom_variable(struct config_gen
*** 5747,5755 ****
  	value = *pHolder->variable;
  
  	if (value)
! 		set_config_option(name, value,
! 						  phcontext, pHolder->gen.source,
! 						  GUC_ACTION_SET, true);
  
  	/*
  	 * Free up as much as we conveniently can of the placeholder structure
--- 5747,5763 ----
  	value = *pHolder->variable;
  
  	if (value)
! 	{
! 		if (set_config_option(name, value,
! 							  phcontext, pHolder->gen.source,
! 							  GUC_ACTION_SET, true))
! 		{
! 			/* Also copy over any saved source-location information */
! 			if (pHolder->gen.sourcefile)
! 				set_config_sourcefile(name, pHolder->gen.sourcefile,
! 									  pHolder->gen.sourceline);
! 		}
! 	}
  
  	/*
  	 * Free up as much as we conveniently can of the placeholder structure