postgrespro
diff --git a/‎src/backend/utils/misc/guc-file.l
Lines changed: 12 additions & 6 deletions b/‎src/backend/utils/misc/guc-file.l
Lines changed: 12 additions & 6 deletions
@@ -296,11 +296,7 @@ ProcessConfigFile(GucContext context)
 								  GUC_ACTION_SET, true);
 		if (scres > 0)
 		{
-			/* variable was updated, so remember the source location */
-			set_config_sourcefile(item->name, item->filename,
-								  item->sourceline);
-
-			/* and log the change if appropriate */
+			/* variable was updated, so log the change if appropriate */
 			if (pre_value)
 			{
 				const char *post_value = GetConfigOption(item->name, true, false);
@@ -315,7 +311,17 @@ ProcessConfigFile(GucContext context)
 		}
 		else if (scres == 0)
 			error = true;
-		/* else no error but variable was not changed, do nothing */
+		/* else no error but variable's active value was not changed */
+
+		/*
+		 * We should update source location unless there was an error, since
+		 * even if the active value didn't change, the reset value might have.
+		 * (In the postmaster, there won't be a difference, but it does matter
+		 * in backends.)
+		 */
+		if (scres != 0)
+			set_config_sourcefile(item->name, item->filename,
+								  item->sourceline);
 
 		if (pre_value)
 			pfree(pre_value);