*** pgsql/src/backend/utils/misc/guc.c	2007/04/23 15:13:30	1.360.2.1
--- pgsql/src/backend/utils/misc/guc.c	2008/05/26 18:54:43	1.360.2.2
***************
*** 10,16 ****
   * Written by Peter Eisentraut <peter_e@gmx.net>.
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.360 2006/11/29 14:50:07 petere Exp $
   *
   *--------------------------------------------------------------------
   */
--- 10,16 ----
   * Written by Peter Eisentraut <peter_e@gmx.net>.
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.360.2.1 2007/04/23 15:13:30 neilc Exp $
   *
   *--------------------------------------------------------------------
   */
*************** set_config_option(const char *name, cons
*** 3982,3987 ****
--- 3982,3991 ----
  					source = conf->gen.reset_source;
  				}
  
+ 				/* Save old value to support transaction abort */
+ 				if (changeVal && !makeDefault)
+ 					push_old_value(&conf->gen);
+ 
  				if (conf->assign_hook)
  					if (!(*conf->assign_hook) (newval, changeVal, source))
  					{
*************** set_config_option(const char *name, cons
*** 3994,4002 ****
  
  				if (changeVal || makeDefault)
  				{
- 					/* Save old value to support transaction abort */
- 					if (!makeDefault)
- 						push_old_value(&conf->gen);
  					if (changeVal)
  					{
  						*conf->variable = newval;
--- 3998,4003 ----
*************** set_config_option(const char *name, cons
*** 4066,4071 ****
--- 4067,4076 ----
  					source = conf->gen.reset_source;
  				}
  
+ 				/* Save old value to support transaction abort */
+ 				if (changeVal && !makeDefault)
+ 					push_old_value(&conf->gen);
+ 
  				if (conf->assign_hook)
  					if (!(*conf->assign_hook) (newval, changeVal, source))
  					{
*************** set_config_option(const char *name, cons
*** 4078,4086 ****
  
  				if (changeVal || makeDefault)
  				{
- 					/* Save old value to support transaction abort */
- 					if (!makeDefault)
- 						push_old_value(&conf->gen);
  					if (changeVal)
  					{
  						*conf->variable = newval;
--- 4083,4088 ----
*************** set_config_option(const char *name, cons
*** 4150,4155 ****
--- 4152,4161 ----
  					source = conf->gen.reset_source;
  				}
  
+ 				/* Save old value to support transaction abort */
+ 				if (changeVal && !makeDefault)
+ 					push_old_value(&conf->gen);
+ 
  				if (conf->assign_hook)
  					if (!(*conf->assign_hook) (newval, changeVal, source))
  					{
*************** set_config_option(const char *name, cons
*** 4162,4170 ****
  
  				if (changeVal || makeDefault)
  				{
- 					/* Save old value to support transaction abort */
- 					if (!makeDefault)
- 						push_old_value(&conf->gen);
  					if (changeVal)
  					{
  						*conf->variable = newval;
--- 4168,4173 ----
*************** set_config_option(const char *name, cons
*** 4239,4244 ****
--- 4242,4251 ----
  					break;
  				}
  
+ 				/* Save old value to support transaction abort */
+ 				if (changeVal && !makeDefault)
+ 					push_old_value(&conf->gen);
+ 
  				if (conf->assign_hook)
  				{
  					const char *hookresult;
*************** set_config_option(const char *name, cons
*** 4278,4286 ****
  
  				if (changeVal || makeDefault)
  				{
- 					/* Save old value to support transaction abort */
- 					if (!makeDefault)
- 						push_old_value(&conf->gen);
  					if (changeVal)
  					{
  						set_string_field(conf, conf->variable, newval);
--- 4285,4290 ----