=== Applying patches on top of PostgreSQL commit ID b0b91ced167f02ced4adaf1b2ecdc6fa0f6eb6e9 === === applying patch ./v19-0001-Automatic-client-side-column-level-encryption.patch patching file doc/src/sgml/acronyms.sgml patching file doc/src/sgml/catalogs.sgml Hunk #2 succeeded at 1368 with fuzz 1 (offset -7 lines). patching file doc/src/sgml/charset.sgml patching file doc/src/sgml/datatype.sgml Hunk #1 succeeded at 5372 (offset 12 lines). patching file doc/src/sgml/ddl.sgml patching file doc/src/sgml/func.sgml Hunk #1 succeeded at 22856 (offset -3 lines). Hunk #2 succeeded at 23319 (offset -64 lines). patching file doc/src/sgml/glossary.sgml Hunk #1 succeeded at 417 (offset 28 lines). patching file doc/src/sgml/libpq.sgml Hunk #1 succeeded at 2176 (offset 212 lines). Hunk #2 succeeded at 3211 (offset 212 lines). Hunk #3 succeeded at 3249 (offset 212 lines). Hunk #4 succeeded at 3408 (offset 212 lines). Hunk #5 succeeded at 4296 (offset 212 lines). Hunk #6 succeeded at 4499 (offset 212 lines). Hunk #7 succeeded at 5049 (offset 212 lines). Hunk #8 succeeded at 5057 (offset 212 lines). Hunk #9 succeeded at 5114 (offset 212 lines). Hunk #10 succeeded at 5175 (offset 212 lines). Hunk #11 succeeded at 5264 (offset 212 lines). Hunk #12 succeeded at 8298 (offset 212 lines). patching file doc/src/sgml/protocol.sgml Hunk #1 succeeded at 1091 (offset -18 lines). Hunk #2 succeeded at 3859 (offset -52 lines). Hunk #3 succeeded at 4089 (offset -52 lines). Hunk #4 succeeded at 5326 (offset -52 lines). Hunk #5 succeeded at 5753 (offset -52 lines). Hunk #6 succeeded at 7622 (offset -52 lines). patching file doc/src/sgml/ref/allfiles.sgml patching file doc/src/sgml/ref/alter_column_encryption_key.sgml patching file doc/src/sgml/ref/alter_column_master_key.sgml patching file doc/src/sgml/ref/comment.sgml patching file doc/src/sgml/ref/copy.sgml Hunk #1 succeeded at 569 (offset 14 lines). patching file doc/src/sgml/ref/create_column_encryption_key.sgml patching file doc/src/sgml/ref/create_column_master_key.sgml patching file doc/src/sgml/ref/create_table.sgml Hunk #4 succeeded at 757 (offset 12 lines). patching file doc/src/sgml/ref/discard.sgml patching file doc/src/sgml/ref/drop_column_encryption_key.sgml patching file doc/src/sgml/ref/drop_column_master_key.sgml patching file doc/src/sgml/ref/grant.sgml patching file doc/src/sgml/ref/pg_dump.sgml patching file doc/src/sgml/ref/pg_dumpall.sgml patching file doc/src/sgml/ref/psql-ref.sgml patching file doc/src/sgml/reference.sgml patching file src/backend/access/common/printsimple.c patching file src/backend/access/common/printtup.c patching file src/backend/access/common/tupdesc.c Hunk #2 succeeded at 637 (offset 2 lines). Hunk #3 succeeded at 703 (offset 4 lines). patching file src/backend/access/hash/hashvalidate.c patching file src/backend/catalog/Makefile patching file src/backend/catalog/aclchk.c Hunk #6 succeeded at 2729 (offset -6 lines). Hunk #7 succeeded at 2840 (offset -6 lines). Hunk #8 succeeded at 2871 (offset -6 lines). Hunk #9 succeeded at 2987 (offset -6 lines). Hunk #10 succeeded at 3069 (offset -6 lines). patching file src/backend/catalog/dependency.c patching file src/backend/catalog/heap.c Hunk #4 FAILED at 772. 1 out of 5 hunks FAILED -- saving rejects to file src/backend/catalog/heap.c.rej patching file src/backend/catalog/namespace.c patching file src/backend/catalog/objectaddress.c Hunk #9 succeeded at 2668 (offset 6 lines). Hunk #10 succeeded at 3131 (offset 3 lines). patching file src/backend/commands/Makefile patching file src/backend/commands/alter.c Hunk #1 succeeded at 22 with fuzz 2. Hunk #2 succeeded at 121 (offset 1 line). Hunk #3 succeeded at 411 (offset 24 lines). Hunk #4 succeeded at 561 (offset 24 lines). Hunk #5 succeeded at 679 (offset 24 lines). Hunk #6 succeeded at 915 (offset 24 lines). patching file src/backend/commands/colenccmds.c patching file src/backend/commands/createas.c patching file src/backend/commands/discard.c patching file src/backend/commands/dropcmds.c patching file src/backend/commands/event_trigger.c patching file src/backend/commands/meson.build patching file src/backend/commands/seclabel.c patching file src/backend/commands/tablecmds.c Hunk #5 succeeded at 2583 (offset 1 line). Hunk #6 succeeded at 2706 (offset 5 lines). Hunk #7 succeeded at 3001 (offset 5 lines). Hunk #8 succeeded at 7028 (offset 57 lines). Hunk #9 succeeded at 12876 (offset 61 lines). Hunk #10 succeeded at 19489 (offset 71 lines). patching file src/backend/commands/variable.c patching file src/backend/commands/view.c patching file src/backend/nodes/nodeFuncs.c Hunk #1 succeeded at 4116 (offset 133 lines). patching file src/backend/parser/gram.y Hunk #4 succeeded at 710 (offset 17 lines). Hunk #5 FAILED at 711. Hunk #6 succeeded at 970 (offset 25 lines). Hunk #7 succeeded at 2018 (offset 25 lines). Hunk #8 succeeded at 2044 (offset 25 lines). Hunk #9 succeeded at 3737 (offset 25 lines). Hunk #10 succeeded at 3754 (offset 25 lines). Hunk #11 succeeded at 3812 (offset 25 lines). Hunk #12 succeeded at 4077 (offset 25 lines). Hunk #13 succeeded at 6314 (offset 25 lines). Hunk #14 succeeded at 6360 (offset 25 lines). Hunk #15 succeeded at 6875 (offset 25 lines). Hunk #16 succeeded at 7688 (offset 25 lines). Hunk #17 succeeded at 9235 (offset 25 lines). Hunk #18 succeeded at 9932 (offset 25 lines). Hunk #19 succeeded at 10283 (offset 25 lines). Hunk #20 succeeded at 11457 (offset 25 lines). Hunk #21 succeeded at 17254 (offset 289 lines). Hunk #22 FAILED at 17015. Hunk #23 succeeded at 17322 (offset 293 lines). Hunk #24 succeeded at 17812 (offset 299 lines). Hunk #25 FAILED at 17581. Hunk #26 succeeded at 17909 (offset 307 lines). 3 out of 26 hunks FAILED -- saving rejects to file src/backend/parser/gram.y.rej patching file src/backend/parser/parse_param.c patching file src/backend/parser/parse_utilcmd.c Hunk #1 succeeded at 1038 (offset 3 lines). patching file src/backend/postmaster/postmaster.c patching file src/backend/tcop/postgres.c patching file src/backend/tcop/utility.c Hunk #3 succeeded at 1447 (offset 3 lines). Hunk #4 succeeded at 1924 (offset 10 lines). Hunk #5 succeeded at 2254 (offset 10 lines). Hunk #6 succeeded at 2675 (offset 10 lines). Hunk #7 succeeded at 2801 (offset 10 lines). Hunk #8 succeeded at 2964 (offset 10 lines). Hunk #9 succeeded at 3113 (offset 10 lines). Hunk #10 succeeded at 3746 (offset 10 lines). patching file src/backend/utils/adt/acl.c patching file src/backend/utils/adt/varlena.c patching file src/backend/utils/cache/lsyscache.c Hunk #3 succeeded at 3694 (offset -11 lines). patching file src/backend/utils/cache/plancache.c patching file src/backend/utils/cache/syscache.c Hunk #2 succeeded at 223 (offset 1 line). Hunk #3 succeeded at 263 (offset 1 line). patching file src/backend/utils/mb/mbutils.c patching file src/bin/pg_dump/common.c Hunk #2 succeeded at 201 (offset -2 lines). Hunk #3 succeeded at 910 (offset 26 lines). patching file src/bin/pg_dump/dumputils.c patching file src/bin/pg_dump/pg_backup.h patching file src/bin/pg_dump/pg_backup_archiver.c Hunk #1 succeeded at 3445 (offset 49 lines). patching file src/bin/pg_dump/pg_backup_db.c patching file src/bin/pg_dump/pg_dump.c Hunk #2 succeeded at 234 (offset 5 lines). Hunk #3 succeeded at 402 (offset 6 lines). Hunk #4 succeeded at 714 (offset 25 lines). Hunk #5 succeeded at 1097 (offset 34 lines). Hunk #6 succeeded at 5706 (offset 111 lines). Hunk #7 succeeded at 8549 (offset 181 lines). Hunk #8 succeeded at 8611 (offset 181 lines). Hunk #9 succeeded at 8624 (offset 181 lines). Hunk #10 succeeded at 8633 (offset 181 lines). Hunk #11 succeeded at 8662 (offset 181 lines). Hunk #12 succeeded at 8703 (offset 181 lines). Hunk #13 succeeded at 8766 (offset 181 lines). Hunk #14 succeeded at 8796 (offset 181 lines). Hunk #15 succeeded at 10330 (offset 181 lines). Hunk #16 succeeded at 13750 (offset 181 lines). Hunk #17 succeeded at 15970 (offset 181 lines). Hunk #18 succeeded at 18551 (offset 178 lines). patching file src/bin/pg_dump/pg_dump.h Hunk #2 succeeded at 338 (offset 4 lines). Hunk #3 succeeded at 671 with fuzz 1 (offset 3 lines). Hunk #4 succeeded at 717 (offset 3 lines). Hunk #5 succeeded at 746 (offset 3 lines). patching file src/bin/pg_dump/pg_dump_sort.c patching file src/bin/pg_dump/pg_dumpall.c patching file src/bin/pg_dump/t/002_pg_dump.pl Hunk #1 succeeded at 753 (offset 34 lines). Hunk #2 succeeded at 1439 (offset 108 lines). Hunk #3 succeeded at 1908 (offset 139 lines). Hunk #4 succeeded at 3998 (offset 376 lines). patching file src/bin/psql/command.c patching file src/bin/psql/describe.c patching file src/bin/psql/describe.h patching file src/bin/psql/help.c patching file src/bin/psql/settings.h patching file src/bin/psql/startup.c patching file src/bin/psql/tab-complete.c patching file src/common/Makefile patching file src/common/colenc.c patching file src/common/meson.build patching file src/include/access/printtup.h patching file src/include/catalog/dependency.h patching file src/include/catalog/heap.h patching file src/include/catalog/meson.build patching file src/include/catalog/namespace.h patching file src/include/catalog/pg_amop.dat patching file src/include/catalog/pg_amproc.dat patching file src/include/catalog/pg_attribute.h Hunk #1 succeeded at 155 with fuzz 2 (offset -9 lines). patching file src/include/catalog/pg_colenckey.h patching file src/include/catalog/pg_colenckeydata.h patching file src/include/catalog/pg_colmasterkey.h patching file src/include/catalog/pg_opclass.dat patching file src/include/catalog/pg_operator.dat patching file src/include/catalog/pg_opfamily.dat patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 6388 (offset 33 lines). Hunk #2 succeeded at 7183 (offset 33 lines). Hunk #3 succeeded at 12123 (offset 114 lines). patching file src/include/catalog/pg_type.dat patching file src/include/catalog/pg_type.h patching file src/include/commands/colenccmds.h patching file src/include/commands/tablecmds.h patching file src/include/common/colenc.h patching file src/include/libpq/libpq-be.h patching file src/include/nodes/parsenodes.h Hunk #3 succeeded at 2089 (offset 108 lines). Hunk #4 succeeded at 2279 (offset 108 lines). Hunk #5 succeeded at 3782 (offset 108 lines). patching file src/include/parser/kwlist.h Hunk #1 succeeded at 150 (offset 1 line). Hunk #2 FAILED at 229. Hunk #3 succeeded at 260 (offset 9 lines). 1 out of 3 hunks FAILED -- saving rejects to file src/include/parser/kwlist.h.rej patching file src/include/parser/parse_param.h patching file src/include/tcop/cmdtaglist.h patching file src/include/utils/acl.h patching file src/include/utils/lsyscache.h patching file src/include/utils/plancache.h patching file src/include/utils/syscache.h patching file src/interfaces/libpq/Makefile patching file src/interfaces/libpq/exports.txt patching file src/interfaces/libpq/fe-connect.c Hunk #1 succeeded at 357 with fuzz 2 (offset 16 lines). Hunk #2 succeeded at 1715 (offset 295 lines). Hunk #3 succeeded at 4446 (offset 355 lines). patching file src/interfaces/libpq/fe-encrypt-openssl.c patching file src/interfaces/libpq/fe-encrypt.h patching file src/interfaces/libpq/fe-exec.c Hunk #3 succeeded at 1190 (offset 4 lines). Hunk #4 succeeded at 1672 (offset 4 lines). Hunk #5 succeeded at 1959 (offset 4 lines). Hunk #6 succeeded at 1977 (offset 4 lines). Hunk #7 succeeded at 2016 (offset 4 lines). Hunk #8 succeeded at 2132 (offset 4 lines). Hunk #9 succeeded at 2175 (offset 4 lines). Hunk #10 succeeded at 2274 (offset 4 lines). Hunk #11 succeeded at 2323 (offset 4 lines). Hunk #12 succeeded at 2382 (offset 4 lines). Hunk #13 succeeded at 2400 (offset 4 lines). Hunk #14 succeeded at 2882 (offset 4 lines). Hunk #15 succeeded at 4150 (offset 4 lines). Hunk #16 succeeded at 4198 (offset 4 lines). Hunk #17 succeeded at 4394 (offset 4 lines). patching file src/interfaces/libpq/fe-protocol3.c patching file src/interfaces/libpq/fe-trace.c patching file src/interfaces/libpq/libpq-fe.h patching file src/interfaces/libpq/libpq-int.h Hunk #1 succeeded at 115 (offset 3 lines). Hunk #2 succeeded at 356 (offset 10 lines). Hunk #3 FAILED at 419. Hunk #4 FAILED at 500. Hunk #5 succeeded at 725 (offset 29 lines). 2 out of 5 hunks FAILED -- saving rejects to file src/interfaces/libpq/libpq-int.h.rej patching file src/interfaces/libpq/meson.build Hunk #2 FAILED at 117. 1 out of 2 hunks FAILED -- saving rejects to file src/interfaces/libpq/meson.build.rej patching file src/interfaces/libpq/nls.mk patching file src/interfaces/libpq/t/003_encrypt.pl patching file src/interfaces/libpq/test/.gitignore patching file src/interfaces/libpq/test/Makefile patching file src/interfaces/libpq/test/meson.build patching file src/test/Makefile patching file src/test/column_encryption/.gitignore patching file src/test/column_encryption/Makefile patching file src/test/column_encryption/meson.build patching file src/test/column_encryption/t/001_column_encryption.pl patching file src/test/column_encryption/t/002_cmk_rotation.pl patching file src/test/column_encryption/test_client.c patching file src/test/column_encryption/test_run_decrypt.pl patching file src/test/meson.build patching file src/test/regress/expected/column_encryption.out patching file src/test/regress/expected/object_address.out patching file src/test/regress/expected/oidjoins.out patching file src/test/regress/expected/opr_sanity.out patching file src/test/regress/expected/type_sanity.out patching file src/test/regress/parallel_schedule patching file src/test/regress/pg_regress_main.c patching file src/test/regress/sql/column_encryption.sql patching file src/test/regress/sql/object_address.sql patching file src/test/regress/sql/type_sanity.sql