3 files changed, 3 insertions, 52 deletions

diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 78df9a8da8..7a1b8e885b 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.202 2010/02/26 02:00:37 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.203 2010/04/28 16:10:41 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -787,23 +787,6 @@ copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex,
 	 */
 	use_wal = XLogIsNeeded() && !NewHeap->rd_istemp;
 
-	/*
-	 * Write an XLOG UNLOGGED record if WAL-logging was skipped because WAL
-	 * archiving is not enabled.
-	 */
-	if (!use_wal && !NewHeap->rd_istemp)
-	{
-		char		reason[NAMEDATALEN + 32];
-
-		if (OldIndex != NULL)
-			snprintf(reason, sizeof(reason), "CLUSTER on \"%s\"",
-					 RelationGetRelationName(NewHeap));
-		else
-			snprintf(reason, sizeof(reason), "VACUUM FULL on \"%s\"",
-					 RelationGetRelationName(NewHeap));
-		XLogReportUnloggedStatement(reason);
-	}
-
 	/* use_wal off requires smgr_targblock be initially invalid */
 	Assert(RelationGetTargetBlock(NewHeap) == InvalidBlockNumber);
 
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 9031cd1fa5..4e95a8315c 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.326 2010/02/26 02:00:38 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.327 2010/04/28 16:10:41 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2223,14 +2223,7 @@ CopyFrom(CopyState cstate)
 	 * indexes since those use WAL anyway)
 	 */
 	if (hi_options & HEAP_INSERT_SKIP_WAL)
-	{
-		char		reason[NAMEDATALEN + 30];
-
-		snprintf(reason, sizeof(reason), "COPY FROM on \"%s\"",
-				 RelationGetRelationName(cstate->rel));
-		XLogReportUnloggedStatement(reason);
 		heap_sync(cstate->rel);
-	}
 }
 
 
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index dda0b2e847..18e2f57128 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.329 2010/03/20 00:43:42 rhaas Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.330 2010/04/28 16:10:41 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -3272,14 +3272,7 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap)
 
 		/* If we skipped writing WAL, then we need to sync the heap. */
 		if (hi_options & HEAP_INSERT_SKIP_WAL)
-		{
-			char		reason[NAMEDATALEN + 30];
-
-			snprintf(reason, sizeof(reason), "table rewrite on \"%s\"",
-					 RelationGetRelationName(newrel));
-			XLogReportUnloggedStatement(reason);
 			heap_sync(newrel);
-		}
 
 		heap_close(newrel, NoLock);
 	}
@@ -7021,20 +7014,6 @@ ATExecSetTableSpace(Oid tableOid, Oid newTableSpace)
 
 	heap_close(pg_class, RowExclusiveLock);
 
-	/*
-	 * Write an XLOG UNLOGGED record if WAL-logging was skipped because WAL
-	 * archiving is not enabled.
-	 */
-	if (!XLogIsNeeded() && !rel->rd_istemp)
-	{
-		char		reason[NAMEDATALEN + 40];
-
-		snprintf(reason, sizeof(reason), "ALTER TABLE SET TABLESPACE on \"%s\"",
-				 RelationGetRelationName(rel));
-
-		XLogReportUnloggedStatement(reason);
-	}
-
 	relation_close(rel, NoLock);
 
 	/* Make sure the reltablespace change is visible */
@@ -7063,10 +7042,6 @@ copy_relation_data(SMgrRelation src, SMgrRelation dst,
 	/*
 	 * We need to log the copied data in WAL iff WAL archiving/streaming is
 	 * enabled AND it's not a temp rel.
-	 *
-	 * Note: If you change the conditions here, update the conditions in
-	 * ATExecSetTableSpace() for when an XLOG UNLOGGED record is written to
-	 * match.
 	 */
 	use_wal = XLogIsNeeded() && !istemp;