=== Applying patches on top of PostgreSQL commit ID d4c3a6b8ad830882066122081a7141ecd573f45d ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Jan 31 19:52:26 UTC 2025
On branch cf/4240
nothing to commit, working tree clean
=== applying patch ./v2-0001-Optimize-cross-database-SERIALIZABLE-safe-snapsho.patch
Applied patch to 'src/backend/storage/lmgr/predicate.c' with conflicts.
Applied patch to 'src/include/storage/predicate_internals.h' cleanly.
U src/backend/storage/lmgr/predicate.c
diff --cc src/backend/storage/lmgr/predicate.c
index 5b21a05398,5e62027284..0000000000
--- a/src/backend/storage/lmgr/predicate.c
+++ b/src/backend/storage/lmgr/predicate.c
@@@ -1268,7 -1219,8 +1275,12 @@@ PredicateLockShmemInit(void
  		PredXact->OldCommittedSxact->xmin = InvalidTransactionId;
  		PredXact->OldCommittedSxact->flags = SXACT_FLAG_COMMITTED;
  		PredXact->OldCommittedSxact->pid = 0;
++<<<<<<< ours
 +		PredXact->OldCommittedSxact->pgprocno = INVALID_PROC_NUMBER;
++=======
+ 		PredXact->OldCommittedSxact->pgprocno = INVALID_PGPROCNO;
+ 		PredXact->OldCommittedSxact->database = InvalidOid;
++>>>>>>> theirs
  	}
  	/* This never changes, so let's keep a local copy. */
  	OldCommittedSxact = PredXact->OldCommittedSxact;
@@@ -1850,7 -1802,8 +1862,12 @@@ GetSerializableTransactionSnapshotInt(S
  	sxact->finishedBefore = InvalidTransactionId;
  	sxact->xmin = snapshot->xmin;
  	sxact->pid = MyProcPid;
++<<<<<<< ours
 +	sxact->pgprocno = MyProcNumber;
++=======
+ 	sxact->pgprocno = MyProc->pgprocno;
+ 	sxact->database = MyDatabaseId;
++>>>>>>> theirs
  	dlist_init(&sxact->predicateLocks);
  	dlist_node_init(&sxact->finishedLink);
  	sxact->flags = 0;
@@@ -4926,11 -4889,12 +4953,16 @@@ predicatelock_twophase_recover(Transact
  					(errcode(ERRCODE_OUT_OF_MEMORY),
  					 errmsg("out of shared memory")));
  
 -		/* vxid for a prepared xact is InvalidBackendId/xid; no pid */
 -		sxact->vxid.backendId = InvalidBackendId;
 +		/* vxid for a prepared xact is INVALID_PROC_NUMBER/xid; no pid */
 +		sxact->vxid.procNumber = INVALID_PROC_NUMBER;
  		sxact->vxid.localTransactionId = (LocalTransactionId) xid;
  		sxact->pid = 0;
++<<<<<<< ours
 +		sxact->pgprocno = INVALID_PROC_NUMBER;
++=======
+ 		sxact->pgprocno = INVALID_PGPROCNO;
+ 		sxact->database = InvalidOid;
++>>>>>>> theirs
  
  		/* a prepared xact hasn't committed yet */
  		sxact->prepareSeqNo = RecoverySerCommitSeqNo;