=== Applying patches on top of PostgreSQL commit ID 3f2d72b4934945da76f6bc60dfe3fc5ca42e7526 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Dec 26 21:51:31 UTC 2024
On branch cf/4874
nothing to commit, working tree clean
=== applying patch ./v25-0001-Remove-unused-rs_cindex-condition-in-heap-AM-bit.patch
Applied patch to 'src/backend/access/heap/heapam.c' with conflicts.
Applied patch to 'src/backend/access/heap/heapam_handler.c' with conflicts.
U src/backend/access/heap/heapam.c
U src/backend/access/heap/heapam_handler.c
diff --cc src/backend/access/heap/heapam.c
index 329e727f80,cbc5f62aff..0000000000
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@@ -378,7 -378,6 +378,10 @@@ initscan(HeapScanDesc scan, ScanKey key
  	ItemPointerSetInvalid(&scan->rs_ctup.t_self);
  	scan->rs_cbuf = InvalidBuffer;
  	scan->rs_cblock = InvalidBlockNumber;
++<<<<<<< ours
 +	scan->rs_ntuples = 0;
++=======
++>>>>>>> theirs
  	scan->rs_cindex = 0;
  
  	/*
diff --cc src/backend/access/heap/heapam_handler.c
index 53f572f384,bdb7599684..0000000000
--- a/src/backend/access/heap/heapam_handler.c
+++ b/src/backend/access/heap/heapam_handler.c
@@@ -2300,6 -2269,7 +2300,10 @@@ heapam_scan_bitmap_next_tuple(TableScan
  	/*
  	 * Out of range?  If so, nothing more to look at on this page
  	 */
++<<<<<<< ours
++=======
+ 	Assert(hscan->rs_cindex >= 0);
++>>>>>>> theirs
  	if (hscan->rs_cindex >= hscan->rs_ntuples)
  		return false;