=== Applying patches on top of PostgreSQL commit ID b227b0bb4e032e19b3679bedac820eba3ac0d1cf ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Aug 12 02:59:17 UTC 2025
On branch cf/5714
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Allow-to-collect-statistics-on-virtual-generated-.patch ===
Applying: Allow to collect statistics on virtual generated columns
Using index info to reconstruct a base tree...
M	src/backend/optimizer/util/plancat.c
M	src/backend/statistics/extended_stats.c
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
Auto-merging src/backend/statistics/extended_stats.c
Auto-merging src/backend/optimizer/util/plancat.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 Allow to collect statistics on virtual generated columns
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	doc/src/sgml/ref/alter_table.sgml
M	src/backend/commands/analyze.c
M	src/backend/optimizer/util/plancat.c
M	src/backend/statistics/extended_stats.c
M	src/backend/utils/adt/selfuncs.c
M	src/include/nodes/pathnodes.h
M	src/include/statistics/extended_stats_internal.h
M	src/test/regress/expected/generated_virtual.out
M	src/test/regress/sql/generated_virtual.sql
=== using patch(1) to apply patch ./v2-0001-Allow-to-collect-statistics-on-virtual-generated-.patch ===
patching file doc/src/sgml/ref/alter_table.sgml
patching file src/backend/commands/analyze.c
patching file src/backend/optimizer/util/plancat.c
patching file src/backend/statistics/extended_stats.c
Hunk #2 succeeded at 2074 (offset -20 lines).
patching file src/backend/utils/adt/selfuncs.c
Hunk #1 FAILED at 5408.
Hunk #2 succeeded at 5527 (offset -49 lines).
Hunk #3 succeeded at 5582 (offset -49 lines).
1 out of 3 hunks FAILED -- saving rejects to file src/backend/utils/adt/selfuncs.c.rej
patching file src/include/nodes/pathnodes.h
patching file src/include/statistics/extended_stats_internal.h
patching file src/test/regress/expected/generated_virtual.out
patching file src/test/regress/sql/generated_virtual.sql
Unstaged changes after reset:
M	doc/src/sgml/ref/alter_table.sgml
M	src/backend/commands/analyze.c
M	src/backend/optimizer/util/plancat.c
M	src/backend/statistics/extended_stats.c
M	src/backend/utils/adt/selfuncs.c
M	src/include/nodes/pathnodes.h
M	src/include/statistics/extended_stats_internal.h
M	src/test/regress/expected/generated_virtual.out
M	src/test/regress/sql/generated_virtual.sql
Removing src/backend/utils/adt/selfuncs.c.rej
=== using 'git apply' to apply patch ./v2-0001-Allow-to-collect-statistics-on-virtual-generated-.patch ===
Applied patch to 'doc/src/sgml/ref/alter_table.sgml' cleanly.
Applied patch to 'src/backend/commands/analyze.c' cleanly.
Applied patch to 'src/backend/optimizer/util/plancat.c' cleanly.
Applied patch to 'src/backend/statistics/extended_stats.c' cleanly.
Applied patch to 'src/backend/utils/adt/selfuncs.c' with conflicts.
Applied patch to 'src/include/nodes/pathnodes.h' cleanly.
Applied patch to 'src/include/statistics/extended_stats_internal.h' cleanly.
Applied patch to 'src/test/regress/expected/generated_virtual.out' cleanly.
Applied patch to 'src/test/regress/sql/generated_virtual.sql' cleanly.
U src/backend/utils/adt/selfuncs.c
diff --cc src/backend/utils/adt/selfuncs.c
index 1c480cfaaf7,00e3972ff4f..00000000000
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@@ -5408,6 -5408,8 +5408,11 @@@ examine_variable(PlannerInfo *root, Nod
  		 */
  		ListCell   *ilist;
  		ListCell   *slist;
++<<<<<<< ours
++=======
+ 		ListCell   *vlist;
+ 		Oid			userid;
++>>>>>>> theirs
  
  		/*
  		 * The nullingrels bits within the expression could prevent us from