=== Applying patches on top of PostgreSQL commit ID 93a3e6839bf8d2e0498291335191b57ddf458b48 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Jun  9 22:31:28 UTC 2026
On branch cf/6356
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v10-0001-Use-hash-based-MCV-matching-for-ScalarArrayOpExp.patch ===
Applying: Use hash-based MCV matching for ScalarArrayOpExpr selectivity
Using index info to reconstruct a base tree...
M	src/backend/utils/adt/selfuncs.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/adt/selfuncs.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/selfuncs.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 Use hash-based MCV matching for ScalarArrayOpExpr selectivity
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".
=== using patch(1) to apply patch ./v10-0001-Use-hash-based-MCV-matching-for-ScalarArrayOpExp.patch ===
patching file src/backend/utils/adt/selfuncs.c
Hunk #7 FAILED at 2999.
Hunk #8 succeeded at 3653 (offset 14 lines).
1 out of 8 hunks FAILED -- saving rejects to file src/backend/utils/adt/selfuncs.c.rej
Unstaged changes after reset:
M	src/backend/utils/adt/selfuncs.c
Removing src/backend/utils/adt/selfuncs.c.rej
=== using 'git apply' to apply patch ./v10-0001-Use-hash-based-MCV-matching-for-ScalarArrayOpExp.patch ===
Applied patch to 'src/backend/utils/adt/selfuncs.c' with conflicts.
U src/backend/utils/adt/selfuncs.c
diff --cc src/backend/utils/adt/selfuncs.c
index d6efd07073a,af12071ed0e..00000000000
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@@ -2475,10 -2999,8 +3011,15 @@@ eqjoinsel(PG_FUNCTION_ARGS
  		 * If the MCV lists are long enough to justify hashing, try to look up
  		 * hash functions for the join operator.
  		 */
++<<<<<<< ours
 +		if ((sslot1.nvalues + sslot2.nvalues) >= EQJOINSEL_MCV_HASH_THRESHOLD)
 +			(void) get_op_hash_functions_ext(operator,
 +											 exprType((Node *) linitial(args)),
 +											 &hashLeft, &hashRight);
++=======
+ 		if ((sslot1.nvalues + sslot2.nvalues) >= MCV_HASH_THRESHOLD)
+ 			(void) get_op_hash_functions(operator, &hashLeft, &hashRight);
++>>>>>>> theirs
  	}
  	else
  		memset(&eqproc, 0, sizeof(eqproc)); /* silence uninit-var warnings */