=== Applying patches on top of PostgreSQL commit ID 57431a911d3a650451d198846ad3194900666152 === === applying patch ./0001-MERGE-SQL-Command-following-SQL-2016_v7.patch patching file contrib/test_decoding/expected/ddl.out patching file contrib/test_decoding/sql/ddl.sql patching file doc/src/sgml/libpq.sgml patching file doc/src/sgml/mvcc.sgml patching file doc/src/sgml/plpgsql.sgml patching file doc/src/sgml/ref/allfiles.sgml patching file doc/src/sgml/ref/create_policy.sgml patching file doc/src/sgml/ref/insert.sgml patching file doc/src/sgml/ref/merge.sgml patching file doc/src/sgml/reference.sgml patching file doc/src/sgml/trigger.sgml patching file src/backend/access/heap/heapam.c Hunk #1 succeeded at 2945 (offset -290 lines). Hunk #2 succeeded at 3216 (offset -290 lines). Hunk #3 succeeded at 3255 (offset -291 lines). Hunk #4 succeeded at 3359 (offset -291 lines). Hunk #5 succeeded at 3376 (offset -291 lines). Hunk #6 succeeded at 3454 (offset -291 lines). Hunk #7 succeeded at 3543 (offset -291 lines). Hunk #8 succeeded at 3582 (offset -291 lines). Hunk #9 succeeded at 3591 (offset -291 lines). Hunk #10 succeeded at 3628 (offset -292 lines). Hunk #11 succeeded at 3745 (offset -292 lines). Hunk #12 succeeded at 4050 (offset -299 lines). Hunk #13 succeeded at 4195 (offset -381 lines). Hunk #14 succeeded at 4785 (offset -381 lines). patching file src/backend/catalog/sql_features.txt patching file src/backend/commands/explain.c Hunk #1 succeeded at 1021 (offset -1 lines). Hunk #2 succeeded at 1535 (offset -1 lines). Hunk #3 succeeded at 3108 (offset -1 lines). Hunk #4 succeeded at 3225 (offset -1 lines). Hunk #5 succeeded at 3234 (offset -1 lines). patching file src/backend/commands/prepare.c patching file src/backend/commands/trigger.c Hunk #1 succeeded at 83 (offset -2 lines). Hunk #2 succeeded at 94 (offset -2 lines). Hunk #3 succeeded at 2761 (offset -2 lines). Hunk #4 succeeded at 2776 (offset -2 lines). Hunk #5 succeeded at 2859 (offset -2 lines). Hunk #6 succeeded at 2997 (offset -2 lines). Hunk #7 succeeded at 3019 (offset -2 lines). Hunk #8 succeeded at 3139 (offset -2 lines). Hunk #9 succeeded at 3288 (offset -2 lines). Hunk #10 succeeded at 3315 (offset -2 lines). Hunk #11 succeeded at 3361 (offset -2 lines). Hunk #12 succeeded at 3898 (offset -2 lines). Hunk #13 succeeded at 4380 (offset -2 lines). Hunk #14 succeeded at 4729 (offset -2 lines). Hunk #15 succeeded at 4744 (offset -2 lines). Hunk #16 succeeded at 4798 (offset -2 lines). Hunk #17 succeeded at 4994 (offset -2 lines). Hunk #18 succeeded at 5780 (offset -2 lines). Hunk #19 succeeded at 5919 (offset -2 lines). Hunk #20 succeeded at 5929 (offset -2 lines). patching file src/backend/executor/Makefile patching file src/backend/executor/README patching file src/backend/executor/execMain.c Hunk #1 succeeded at 233 (offset -1 lines). Hunk #2 succeeded at 1326 (offset -1 lines). Hunk #3 succeeded at 2146 (offset -1 lines). patching file src/backend/executor/execMerge.c patching file src/backend/executor/execPartition.c Hunk #1 succeeded at 440 (offset 1 line). Hunk #2 succeeded at 707 (offset 1 line). Hunk #3 succeeded at 1034 (offset 1 line). Hunk #4 succeeded at 1187 (offset 1 line). patching file src/backend/executor/execReplication.c Hunk #1 succeeded at 475 (offset -4 lines). Hunk #2 succeeded at 540 (offset -4 lines). patching file src/backend/executor/instrument.c patching file src/backend/executor/nodeIndexonlyscan.c Hunk #1 succeeded at 164 (offset 2 lines). patching file src/backend/executor/nodeModifyTable.c Hunk #1 succeeded at 44 (offset 1 line). patching file src/backend/executor/spi.c patching file src/backend/nodes/copyfuncs.c Hunk #3 succeeded at 2198 with fuzz 2. Hunk #6 succeeded at 5135 (offset 1 line). Hunk #7 succeeded at 5213 (offset 1 line). patching file src/backend/nodes/equalfuncs.c Hunk #1 succeeded at 813 with fuzz 2. Hunk #4 succeeded at 3201 (offset 1 line). Hunk #5 succeeded at 3269 (offset 1 line). patching file src/backend/nodes/nodeFuncs.c Hunk #3 succeeded at 2972 (offset 9 lines). Hunk #4 succeeded at 3149 (offset 9 lines). Hunk #5 succeeded at 3293 (offset 10 lines). Hunk #6 succeeded at 3475 (offset 10 lines). patching file src/backend/nodes/outfuncs.c Hunk #3 succeeded at 1691 with fuzz 1. Hunk #6 succeeded at 2923 (offset -1 lines). Hunk #7 succeeded at 3658 (offset 2 lines). Hunk #8 succeeded at 3949 (offset 2 lines). patching file src/backend/nodes/readfuncs.c Hunk #3 succeeded at 1623 (offset 3 lines). Hunk #4 succeeded at 1639 (offset 3 lines). Hunk #5 succeeded at 2716 (offset 3 lines). Hunk #6 succeeded at 2740 (offset 3 lines). patching file src/backend/optimizer/plan/createplan.c Hunk #1 succeeded at 279 (offset -1 lines). Hunk #2 succeeded at 2463 (offset 27 lines). Hunk #3 succeeded at 6464 (offset -94 lines). Hunk #4 succeeded at 6497 (offset -94 lines). Hunk #5 succeeded at 6530 (offset -94 lines). patching file src/backend/optimizer/plan/planner.c Hunk #1 succeeded at 819 (offset 18 lines). Hunk #2 succeeded at 1593 (offset 27 lines). Hunk #3 FAILED at 1627. Hunk #4 succeeded at 2190 (offset 27 lines). Hunk #5 FAILED at 2215. 2 out of 5 hunks FAILED -- saving rejects to file src/backend/optimizer/plan/planner.c.rej patching file src/backend/optimizer/plan/setrefs.c Hunk #1 succeeded at 847 (offset 1 line). patching file src/backend/optimizer/prep/preptlist.c patching file src/backend/optimizer/util/pathnode.c Hunk #1 succeeded at 3334 (offset 31 lines). Hunk #2 succeeded at 3413 (offset 31 lines). Hunk #3 succeeded at 3421 (offset 31 lines). patching file src/backend/optimizer/util/plancat.c Hunk #1 succeeded at 1881 (offset 1 line). patching file src/backend/parser/Makefile patching file src/backend/parser/analyze.c Hunk #7 succeeded at 900 (offset 2 lines). Hunk #8 succeeded at 2295 (offset 6 lines). patching file src/backend/parser/gram.y Hunk #5 succeeded at 588 with fuzz 1 (offset -1 lines). Hunk #6 succeeded at 658 (offset -1 lines). Hunk #7 succeeded at 927 (offset -1 lines). Hunk #8 succeeded at 10616 (offset -46 lines). Hunk #9 succeeded at 10679 (offset -46 lines). Hunk #10 succeeded at 11046 (offset -46 lines). Hunk #11 succeeded at 15202 (offset -46 lines). patching file src/backend/parser/parse_agg.c Hunk #1 succeeded at 454 (offset -1 lines). Hunk #2 succeeded at 894 (offset 14 lines). patching file src/backend/parser/parse_clause.c Hunk #1 succeeded at 75 (offset -1 lines). Hunk #2 succeeded at 135 (offset -1 lines). Hunk #3 succeeded at 1055 (offset -1 lines). Hunk #4 succeeded at 1091 (offset -1 lines). Hunk #5 succeeded at 1109 (offset -1 lines). Hunk #6 succeeded at 1127 (offset -1 lines). Hunk #7 succeeded at 1145 (offset -1 lines). Hunk #8 succeeded at 1160 (offset -1 lines). Hunk #9 succeeded at 1188 (offset -1 lines). Hunk #10 succeeded at 1207 (offset -1 lines). Hunk #11 succeeded at 1231 (offset -1 lines). Hunk #12 succeeded at 1285 (offset -1 lines). Hunk #13 succeeded at 1519 (offset -1 lines). patching file src/backend/parser/parse_collate.c patching file src/backend/parser/parse_expr.c Hunk #1 succeeded at 1817 (offset -1 lines). Hunk #2 FAILED at 3476. 1 out of 2 hunks FAILED -- saving rejects to file src/backend/parser/parse_expr.c.rej patching file src/backend/parser/parse_func.c patching file src/backend/parser/parse_merge.c patching file src/backend/parser/parse_relation.c Hunk #1 succeeded at 731 (offset 2 lines). patching file src/backend/rewrite/rewriteHandler.c Hunk #1 succeeded at 1381 (offset 2 lines). Hunk #2 succeeded at 3508 (offset 2 lines). Hunk #3 succeeded at 3516 (offset 2 lines). Hunk #4 succeeded at 3571 (offset 2 lines). patching file src/backend/rewrite/rowsecurity.c Hunk #1 FAILED at 379. 1 out of 2 hunks FAILED -- saving rejects to file src/backend/rewrite/rowsecurity.c.rej patching file src/backend/tcop/pquery.c patching file src/backend/tcop/utility.c patching file src/bin/psql/tab-complete.c Hunk #2 succeeded at 1379 (offset 2 lines). Hunk #3 succeeded at 2835 (offset 8 lines). Hunk #4 succeeded at 2854 (offset 8 lines). Hunk #5 succeeded at 3082 (offset 8 lines). Hunk #6 succeeded at 3156 (offset 8 lines). patching file src/include/access/heapam.h Hunk #1 succeeded at 41 with fuzz 1 (offset -13 lines). Hunk #2 succeeded at 156 (offset -18 lines). patching file src/include/commands/trigger.h patching file src/include/executor/execMerge.h patching file src/include/executor/execPartition.h patching file src/include/executor/instrument.h patching file src/include/executor/nodeModifyTable.h patching file src/include/executor/spi.h patching file src/include/nodes/execnodes.h Hunk #1 succeeded at 366 (offset -1 lines). Hunk #2 succeeded at 480 (offset -1 lines). Hunk #3 succeeded at 1065 (offset -1 lines). Hunk #4 succeeded at 1136 (offset -1 lines). Hunk #5 succeeded at 1157 (offset -1 lines). Hunk #6 succeeded at 1181 (offset -1 lines). Hunk #7 succeeded at 1194 (offset -1 lines). patching file src/include/nodes/nodes.h patching file src/include/nodes/parsenodes.h Hunk #5 succeeded at 1148 (offset 3 lines). Hunk #6 succeeded at 1525 (offset 3 lines). patching file src/include/nodes/plannodes.h can't find file to patch at input line 6614 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h |index 3430061361..f25fb834e9 100644 |--- a/src/include/nodes/relation.h |+++ b/src/include/nodes/relation.h -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored patching file src/include/optimizer/pathnode.h Hunk #1 succeeded at 244 (offset 4 lines). patching file src/include/parser/analyze.h patching file src/include/parser/kwlist.h Hunk #1 succeeded at 244 (offset -1 lines). patching file src/include/parser/parse_clause.h patching file src/include/parser/parse_merge.h patching file src/include/parser/parse_node.h Hunk #2 succeeded at 130 (offset 2 lines). Hunk #3 succeeded at 184 (offset 2 lines). patching file src/include/rewrite/rewriteHandler.h patching file src/interfaces/libpq/fe-exec.c patching file src/pl/plpgsql/src/pl_exec.c patching file src/pl/plpgsql/src/pl_gram.y Hunk #2 succeeded at 1967 (offset 19 lines). Hunk #3 succeeded at 2525 (offset 27 lines). Hunk #4 succeeded at 2988 (offset 27 lines). patching file src/pl/plpgsql/src/pl_scanner.c Hunk #1 FAILED at 138. 1 out of 1 hunk FAILED -- saving rejects to file src/pl/plpgsql/src/pl_scanner.c.rej patching file src/pl/plpgsql/src/plpgsql.h Hunk #1 succeeded at 896 with fuzz 2 (offset 35 lines). patching file src/test/isolation/expected/merge-delete.out patching file src/test/isolation/expected/merge-insert-update.out patching file src/test/isolation/expected/merge-match-recheck.out patching file src/test/isolation/expected/merge-update.out patching file src/test/isolation/isolation_schedule patching file src/test/isolation/specs/merge-delete.spec patching file src/test/isolation/specs/merge-insert-update.spec patching file src/test/isolation/specs/merge-match-recheck.spec patching file src/test/isolation/specs/merge-update.spec patching file src/test/regress/expected/identity.out patching file src/test/regress/expected/merge.out patching file src/test/regress/expected/privileges.out patching file src/test/regress/expected/rowsecurity.out patching file src/test/regress/expected/rules.out patching file src/test/regress/expected/triggers.out Hunk #1 succeeded at 2786 (offset 14 lines). patching file src/test/regress/expected/with.out patching file src/test/regress/parallel_schedule patching file src/test/regress/serial_schedule patching file src/test/regress/sql/identity.sql patching file src/test/regress/sql/merge.sql patching file src/test/regress/sql/privileges.sql patching file src/test/regress/sql/rowsecurity.sql patching file src/test/regress/sql/rules.sql patching file src/test/regress/sql/triggers.sql Hunk #1 succeeded at 2120 (offset 6 lines). patching file src/test/regress/sql/with.sql patching file src/tools/pgindent/typedefs.list