=== Applying patches on top of PostgreSQL commit ID ca09ef3a6aa69a1250bc83e6d9517f28a2ff181c ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Aug  1 00:02:22 UTC 2025
On branch cf/5620
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v10-0001-Improve-accounting-for-memory-used-by-shared-hash-ta.patch ===
Applying: Improve accounting for memory used by shared hash tables
Using index info to reconstruct a base tree...
M	src/backend/storage/ipc/shmem.c
M	src/backend/utils/hash/dynahash.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/hash/dynahash.c
CONFLICT (content): Merge conflict in src/backend/utils/hash/dynahash.c
Auto-merging src/backend/storage/ipc/shmem.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Improve accounting for memory used by shared hash tables
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Unstaged changes after reset:
M	src/backend/storage/ipc/shmem.c
M	src/backend/utils/hash/dynahash.c
M	src/include/utils/hsearch.h
=== using patch(1) to apply patch ./v10-0001-Improve-accounting-for-memory-used-by-shared-hash-ta.patch ===
patching file src/backend/storage/ipc/shmem.c
Hunk #1 succeeded at 74 (offset 1 line).
Hunk #2 succeeded at 352 (offset 5 lines).
patching file src/backend/utils/hash/dynahash.c
Hunk #3 succeeded at 599 (offset 1 line).
Hunk #4 succeeded at 613 (offset 1 line).
Hunk #5 succeeded at 638 (offset 1 line).
Hunk #6 succeeded at 766 (offset 5 lines).
Hunk #7 succeeded at 799 (offset 5 lines).
Hunk #8 succeeded at 907 (offset 5 lines).
Hunk #9 succeeded at 1390 (offset 5 lines).
Hunk #10 succeeded at 1427 (offset 5 lines).
Hunk #11 FAILED at 1801.
Hunk #12 succeeded at 1850 (offset 5 lines).
Hunk #13 succeeded at 2061 (offset 5 lines).
1 out of 13 hunks FAILED -- saving rejects to file src/backend/utils/hash/dynahash.c.rej
patching file src/include/utils/hsearch.h
Unstaged changes after reset:
M	src/backend/storage/ipc/shmem.c
M	src/backend/utils/hash/dynahash.c
M	src/include/utils/hsearch.h
Removing src/backend/utils/hash/dynahash.c.rej
=== using 'git apply' to apply patch ./v10-0001-Improve-accounting-for-memory-used-by-shared-hash-ta.patch ===
Applied patch to 'src/backend/storage/ipc/shmem.c' cleanly.
Applied patch to 'src/backend/utils/hash/dynahash.c' with conflicts.
Applied patch to 'src/include/utils/hsearch.h' cleanly.
U src/backend/utils/hash/dynahash.c
diff --cc src/backend/utils/hash/dynahash.c
index 42e9be274fc,53b84db0683..00000000000
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@@ -1712,17 -1808,13 +1813,18 @@@ element_alloc(HTAB *hashp, int nelem
  {
  	HASHHDR    *hctl = hashp->hctl;
  	Size		elementSize;
- 	HASHELEMENT *firstElement;
- 	HASHELEMENT *tmpElement;
- 	HASHELEMENT *prevElement;
- 	int			i;
+ 	HASHELEMENT *firstElement = NULL;
  
++<<<<<<< ours
 +	if (hctl->isfixed)
 +		return false;
++=======
+ 	if (hashp->isfixed)
+ 		return NULL;
++>>>>>>> theirs
  
  	/* Each element has a HASHELEMENT header plus user data. */
- 	elementSize = MAXALIGN(sizeof(HASHELEMENT)) + MAXALIGN(hctl->entrysize);
- 
+ 	elementSize = HASH_ELEMENT_SIZE(hctl);
  	CurrentDynaHashCxt = hashp->hcxt;
  	firstElement = (HASHELEMENT *) hashp->alloc(nelem * elementSize);