=== Applying patches on top of PostgreSQL commit ID b574fec00f275e50ffe2c9780ec1f6398796c905 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Jun 28 19:38:26 UTC 2026 On branch cf/6809 nothing to commit, working tree clean === using 'git am' to apply patch ./v2-0001-Fix-mismatched-deallocation-functions.patch === Applying: Fix mismatched deallocation functions Using index info to reconstruct a base tree... M src/bin/pg_basebackup/pg_createsubscriber.c M src/bin/pg_basebackup/streamutil.c M src/bin/pg_dump/parallel.c M src/bin/pg_dump/pg_backup_archiver.c M src/bin/pg_dump/pg_backup_tar.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dumpall.c M src/bin/pg_upgrade/check.c M src/bin/psql/common.c M src/bin/psql/describe.c M src/bin/psql/tab-complete.in.c M src/bin/scripts/vacuuming.c M src/fe_utils/print.c M src/test/regress/pg_regress.c Falling back to patching base and 3-way merge... Auto-merging src/test/regress/pg_regress.c Auto-merging src/fe_utils/print.c Auto-merging src/bin/scripts/vacuuming.c Auto-merging src/bin/psql/tab-complete.in.c Auto-merging src/bin/psql/describe.c Auto-merging src/bin/psql/common.c Auto-merging src/bin/pg_upgrade/check.c Auto-merging src/bin/pg_dump/pg_dumpall.c CONFLICT (content): Merge conflict in src/bin/pg_dump/pg_dumpall.c Auto-merging src/bin/pg_dump/pg_dump.c Auto-merging src/bin/pg_dump/pg_backup_tar.c Auto-merging src/bin/pg_dump/pg_backup_archiver.c Auto-merging src/bin/pg_dump/parallel.c Auto-merging src/bin/pg_basebackup/streamutil.c Auto-merging src/bin/pg_basebackup/pg_createsubscriber.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 Fix mismatched deallocation functions 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 ./v2-0001-Fix-mismatched-deallocation-functions.patch === patching file contrib/oid2name/oid2name.c patching file src/bin/initdb/initdb.c patching file src/bin/pg_basebackup/pg_basebackup.c patching file src/bin/pg_basebackup/pg_createsubscriber.c Hunk #4 succeeded at 2508 (offset -5 lines). patching file src/bin/pg_basebackup/streamutil.c patching file src/bin/pg_combinebackup/load_manifest.c patching file src/bin/pg_combinebackup/pg_combinebackup.c patching file src/bin/pg_combinebackup/reconstruct.c patching file src/bin/pg_ctl/pg_ctl.c patching file src/bin/pg_dump/compress_gzip.c patching file src/bin/pg_dump/compress_lz4.c patching file src/bin/pg_dump/compress_none.c patching file src/bin/pg_dump/connectdb.c patching file src/bin/pg_dump/dumputils.c patching file src/bin/pg_dump/parallel.c Hunk #1 succeeded at 485 (offset -14 lines). patching file src/bin/pg_dump/pg_backup_archiver.c Hunk #1 succeeded at 1680 (offset -18 lines). Hunk #2 succeeded at 1780 (offset -22 lines). Hunk #3 succeeded at 2250 (offset -22 lines). Hunk #4 succeeded at 2843 (offset -22 lines). Hunk #5 succeeded at 2903 (offset -22 lines). Hunk #6 succeeded at 3599 (offset -11 lines). Hunk #7 succeeded at 3664 (offset -11 lines). Hunk #8 succeeded at 3725 (offset -11 lines). Hunk #9 succeeded at 3776 (offset -11 lines). Hunk #10 succeeded at 3897 (offset -11 lines). Hunk #11 succeeded at 4110 (offset -14 lines). Hunk #12 succeeded at 5090 (offset -14 lines). patching file src/bin/pg_dump/pg_backup_custom.c patching file src/bin/pg_dump/pg_backup_db.c patching file src/bin/pg_dump/pg_backup_directory.c patching file src/bin/pg_dump/pg_backup_tar.c patching file src/bin/pg_dump/pg_dump.c patching file src/bin/pg_dump/pg_dump_sort.c patching file src/bin/pg_dump/pg_dumpall.c Hunk #1 succeeded at 1336 with fuzz 2 (offset -258 lines). Hunk #2 succeeded at 1475 with fuzz 2 (offset -324 lines). Hunk #3 FAILED at 1865. 1 out of 3 hunks FAILED -- saving rejects to file src/bin/pg_dump/pg_dumpall.c.rej patching file src/bin/pg_upgrade/check.c patching file src/bin/pg_upgrade/function.c patching file src/bin/pg_verifybackup/pg_verifybackup.c patching file src/bin/pgbench/pgbench.c patching file src/bin/psql/command.c patching file src/bin/psql/common.c patching file src/bin/psql/describe.c patching file src/bin/psql/help.c patching file src/bin/psql/input.c patching file src/bin/psql/large_obj.c patching file src/bin/psql/mainloop.c patching file src/bin/psql/prompt.c patching file src/bin/psql/startup.c patching file src/bin/psql/stringutils.c patching file src/bin/psql/tab-complete.in.c Hunk #2 succeeded at 6252 (offset 2 lines). Hunk #3 succeeded at 6552 (offset 2 lines). Hunk #4 succeeded at 6808 (offset 2 lines). Hunk #5 succeeded at 7194 (offset 2 lines). Hunk #6 succeeded at 7321 (offset 2 lines). patching file src/bin/scripts/vacuuming.c patching file src/common/logging.c patching file src/fe_utils/print.c Hunk #2 succeeded at 1809 (offset 1 line). Hunk #3 succeeded at 3619 (offset 1 line). patching file src/interfaces/ecpg/test/pg_regress_ecpg.c patching file src/test/isolation/isolation_main.c patching file src/test/isolation/isolationtester.c patching file src/test/modules/libpq_pipeline/libpq_pipeline.c patching file src/test/regress/pg_regress.c Hunk #3 succeeded at 1682 (offset 2 lines). patching file src/test/regress/pg_regress_main.c Unstaged changes after reset: M contrib/oid2name/oid2name.c M src/bin/initdb/initdb.c M src/bin/pg_basebackup/pg_basebackup.c M src/bin/pg_basebackup/pg_createsubscriber.c M src/bin/pg_basebackup/streamutil.c M src/bin/pg_combinebackup/load_manifest.c M src/bin/pg_combinebackup/pg_combinebackup.c M src/bin/pg_combinebackup/reconstruct.c M src/bin/pg_ctl/pg_ctl.c M src/bin/pg_dump/compress_gzip.c M src/bin/pg_dump/compress_lz4.c M src/bin/pg_dump/compress_none.c M src/bin/pg_dump/connectdb.c M src/bin/pg_dump/dumputils.c M src/bin/pg_dump/parallel.c M src/bin/pg_dump/pg_backup_archiver.c M src/bin/pg_dump/pg_backup_custom.c M src/bin/pg_dump/pg_backup_db.c M src/bin/pg_dump/pg_backup_directory.c M src/bin/pg_dump/pg_backup_tar.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dump_sort.c M src/bin/pg_dump/pg_dumpall.c M src/bin/pg_upgrade/check.c M src/bin/pg_upgrade/function.c M src/bin/pg_verifybackup/pg_verifybackup.c M src/bin/pgbench/pgbench.c M src/bin/psql/command.c M src/bin/psql/common.c M src/bin/psql/describe.c M src/bin/psql/help.c M src/bin/psql/input.c M src/bin/psql/large_obj.c M src/bin/psql/mainloop.c M src/bin/psql/prompt.c M src/bin/psql/startup.c M src/bin/psql/stringutils.c M src/bin/psql/tab-complete.in.c M src/bin/scripts/vacuuming.c M src/common/logging.c M src/fe_utils/print.c M src/interfaces/ecpg/test/pg_regress_ecpg.c M src/test/isolation/isolation_main.c M src/test/isolation/isolationtester.c M src/test/modules/libpq_pipeline/libpq_pipeline.c M src/test/regress/pg_regress.c M src/test/regress/pg_regress_main.c Removing src/bin/pg_dump/pg_dumpall.c.rej === using 'git apply' to apply patch ./v2-0001-Fix-mismatched-deallocation-functions.patch === Applied patch to 'contrib/oid2name/oid2name.c' cleanly. Applied patch to 'src/bin/initdb/initdb.c' cleanly. Applied patch to 'src/bin/pg_basebackup/pg_basebackup.c' cleanly. Applied patch to 'src/bin/pg_basebackup/pg_createsubscriber.c' cleanly. Applied patch to 'src/bin/pg_basebackup/streamutil.c' cleanly. Applied patch to 'src/bin/pg_combinebackup/load_manifest.c' cleanly. Applied patch to 'src/bin/pg_combinebackup/pg_combinebackup.c' cleanly. Applied patch to 'src/bin/pg_combinebackup/reconstruct.c' cleanly. Applied patch to 'src/bin/pg_ctl/pg_ctl.c' cleanly. Applied patch to 'src/bin/pg_dump/compress_gzip.c' cleanly. Applied patch to 'src/bin/pg_dump/compress_lz4.c' cleanly. Applied patch to 'src/bin/pg_dump/compress_none.c' cleanly. Applied patch to 'src/bin/pg_dump/connectdb.c' cleanly. Applied patch to 'src/bin/pg_dump/dumputils.c' cleanly. Applied patch to 'src/bin/pg_dump/parallel.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup_archiver.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup_custom.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup_db.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup_directory.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup_tar.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump_sort.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dumpall.c' with conflicts. Applied patch to 'src/bin/pg_upgrade/check.c' cleanly. Applied patch to 'src/bin/pg_upgrade/function.c' cleanly. Applied patch to 'src/bin/pg_verifybackup/pg_verifybackup.c' cleanly. Applied patch to 'src/bin/pgbench/pgbench.c' cleanly. Applied patch to 'src/bin/psql/command.c' cleanly. Applied patch to 'src/bin/psql/common.c' cleanly. Applied patch to 'src/bin/psql/describe.c' cleanly. Applied patch to 'src/bin/psql/help.c' cleanly. Applied patch to 'src/bin/psql/input.c' cleanly. Applied patch to 'src/bin/psql/large_obj.c' cleanly. Applied patch to 'src/bin/psql/mainloop.c' cleanly. Applied patch to 'src/bin/psql/prompt.c' cleanly. Applied patch to 'src/bin/psql/startup.c' cleanly. Applied patch to 'src/bin/psql/stringutils.c' cleanly. Applied patch to 'src/bin/psql/tab-complete.in.c' cleanly. Applied patch to 'src/bin/scripts/vacuuming.c' cleanly. Applied patch to 'src/common/logging.c' cleanly. Applied patch to 'src/fe_utils/print.c' cleanly. Applied patch to 'src/interfaces/ecpg/test/pg_regress_ecpg.c' cleanly. Applied patch to 'src/test/isolation/isolation_main.c' cleanly. Applied patch to 'src/test/isolation/isolationtester.c' cleanly. Applied patch to 'src/test/modules/libpq_pipeline/libpq_pipeline.c' cleanly. Applied patch to 'src/test/regress/pg_regress.c' cleanly. Applied patch to 'src/test/regress/pg_regress_main.c' cleanly. U src/bin/pg_dump/pg_dumpall.c diff --cc src/bin/pg_dump/pg_dumpall.c index b9653f0aefe,1ad38fbb82f..00000000000 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@@ -1334,9 -1583,18 +1334,9 @@@ dumpRoleGUCPrivs(PGconn *conn exit_nicely(1); } - if (archDumpFormat == archNull) - fprintf(OPF, "%s", buf->data); - else - ArchiveEntry(fout, - nilCatalogId, /* catalog ID */ - createDumpId(), /* dump ID */ - ARCHIVE_OPTS(.tag = psprintf("ROLE %s", fmtId(parowner)), - .description = "ROLE PROPERTIES", - .section = SECTION_PRE_DATA, - .createStmt = buf->data)); + fprintf(OPF, "%s", buf->data); - free(fparname); + pg_free(fparname); destroyPQExpBuffer(buf); } @@@ -1471,11 -1756,50 +1471,11 @@@ dumpTablespaces(PGconn *conn if (!no_security_labels) buildShSecLabels(conn, "pg_tablespace", spcoid, "TABLESPACE", spcname, - seclabel_buf); - - if (archDumpFormat == archNull) - { - fprintf(OPF, "%s", buf->data); - - if (comment_buf->data[0] != '\0') - fprintf(OPF, "%s", comment_buf->data); + buf); - if (seclabel_buf->data[0] != '\0') - fprintf(OPF, "%s", seclabel_buf->data); - } - else - { - char *tag = psprintf("TABLESPACE %s", fmtId(fspcname)); - - ArchiveEntry(fout, - nilCatalogId, /* catalog ID */ - createDumpId(), /* dump ID */ - ARCHIVE_OPTS(.tag = tag, - .description = "TABLESPACE", - .section = SECTION_PRE_DATA, - .createStmt = buf->data)); - - if (comment_buf->data[0] != '\0') - ArchiveEntry(fout, - nilCatalogId, /* catalog ID */ - createDumpId(), /* dump ID */ - ARCHIVE_OPTS(.tag = tag, - .description = "COMMENT", - .section = SECTION_PRE_DATA, - .createStmt = comment_buf->data)); - - if (seclabel_buf->data[0] != '\0') - ArchiveEntry(fout, - nilCatalogId, /* catalog ID */ - createDumpId(), /* dump ID */ - ARCHIVE_OPTS(.tag = tag, - .description = "SECURITY LABEL", - .section = SECTION_PRE_DATA, - .createStmt = seclabel_buf->data)); - } + fprintf(OPF, "%s", buf->data); - free(fspcname); + pg_free(fspcname); destroyPQExpBuffer(buf); } @@@ -1519,9 -1847,26 +1519,32 @@@ dropDBs(PGconn *conn strcmp(dbname, "template0") != 0 && strcmp(dbname, "postgres") != 0) { ++<<<<<<< ours + fprintf(OPF, "DROP DATABASE %s%s;\n", + if_exists ? "IF EXISTS " : "", + fmtId(dbname)); ++======= + if (archDumpFormat == archNull) + { + fprintf(OPF, "DROP DATABASE %s%s;\n", + if_exists ? "IF EXISTS " : "", + fmtId(dbname)); + } + else + { + char *stmt = psprintf("DROP DATABASE IF EXISTS %s;\n", + fmtId(dbname)); + + ArchiveEntry(fout, + nilCatalogId, /* catalog ID */ + createDumpId(), /* dump ID */ + ARCHIVE_OPTS(.tag = psprintf("DATABASE %s", fmtId(dbname)), + .description = "DROP_GLOBAL", + .section = SECTION_PRE_DATA, + .createStmt = stmt)); + pfree(stmt); + } ++>>>>>>> theirs } }