postgrespro
diff --git a/‎src/backend/storage/ipc/standby.c
Lines changed: 2 additions & 1 deletion b/‎src/backend/storage/ipc/standby.c
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/test/recovery/t/007_twophase.pl
Lines changed: 15 additions & 8 deletions b/‎src/test/recovery/t/007_twophase.pl
Lines changed: 15 additions & 8 deletions
diff --git a/‎src/test/recovery/t/twophase_recovery_bug.pl
Lines changed: 0 additions & 45 deletions b/‎src/test/recovery/t/twophase_recovery_bug.pl
Lines changed: 0 additions & 45 deletions
diff --git a/‎src/test/recovery/t/twophase_recovery_bug_2.pl
Lines changed: 0 additions & 39 deletions b/‎src/test/recovery/t/twophase_recovery_bug_2.pl
Lines changed: 0 additions & 39 deletions
@@ -607,7 +607,8 @@ StandbyAcquireAccessExclusiveLock(TransactionId xid, Oid dbOid, Oid relOid)
 	/* Already processed? */
 	if (!TransactionIdIsValid(xid) ||
 		TransactionIdDidCommit(xid) ||
-		TransactionIdDidAbort(xid))
+		TransactionIdDidAbort(xid) ||
+		StandbyTransactionIdIsPrepared(xid))
 		return;
 
 	elog(trace_recovery(DEBUG4),
 
@@ -2,13 +2,13 @@
 use warnings;
 use PostgresNode;
 use TestLib;
-use Test::More tests => 11;
+use Test::More tests => 12;
 
 # Setup master node
 my $node_master = get_new_node("master");
 $node_master->init(allows_streaming => 1);
 $node_master->append_conf('postgresql.conf', qq(
-max_prepared_transactions = 10
+	max_prepared_transactions = 10
 ));
 $node_master->start;
 $node_master->backup('master_backup');
@@ -224,13 +224,20 @@
 
 
 ###############################################################################
-# Commit prepared on master while slave is down.
+# Check for a lock confcict between prepared tx with DDL inside and replay of
+# XLOG_STANDBY_LOCK wal record.
 ###############################################################################
 
-# Switch to asynchronous replication
-#$node_master->append_conf('postgresql.conf', qq(
-#	synchronous_standby_names = ''
-#));
-#$node_master->psql('postgres', "select pg_reload_conf()");
+$node_master->psql('postgres', "
+	begin;
+	create table t2(id int);
+	prepare transaction 'x';
+	-- checkpoint will issue XLOG_STANDBY_LOCK that can conflict with lock
+	-- held by 'create table' statement
+	checkpoint;
+	commit prepared 'x';
+");
 
+$node_slave->psql('postgres',"select count(*) from pg_prepared_xacts", stdout => \$psql_out);
+is($psql_out, '0', "Replay tx with DDL");