diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 9254d57e345bcaf99727be68cd3cc4106e420865..845c59625d6a1aebc51913fc455e3eb87e67ac0b 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.112 2005/07/25 22:12:32 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.113 2005/08/08 23:39:01 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -346,10 +346,13 @@ assign_timezone(const char *value, bool doit, GucSource source)
 			 * pg_timezone_initialize() will eventually select a default
 			 * value from the environment.
 			 */
-			const char *curzone = pg_get_timezone_name(global_timezone);
+			if (doit)
+			{
+				const char *curzone = pg_get_timezone_name(global_timezone);
 
-			if (curzone)
-				value = curzone;
+				if (curzone)
+					value = curzone;
+			}
 		}
 		else
 		{