Skip to content

[pull] master from postgres:master #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 8, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/bin/pg_dump/pg_backup_directory.c
Original file line number Diff line number Diff line change
Expand Up @@ -412,10 +412,15 @@ _LoadLOs(ArchiveHandle *AH, TocEntry *te)

/*
* Note: before archive v16, there was always only one BLOBS TOC entry,
* now there can be multiple. We don't need to worry what version we are
* reading though, because tctx->filename should be correct either way.
* now there can be multiple. Furthermore, although the actual filename
* was always "blobs.toc" before v16, the value of tctx->filename did not
* match that before commit 548e50976 fixed it. For simplicity we assume
* it must be "blobs.toc" in all archives before v16.
*/
setFilePath(AH, tocfname, tctx->filename);
if (AH->version < K_VERS_1_16)
setFilePath(AH, tocfname, "blobs.toc");
else
setFilePath(AH, tocfname, tctx->filename);

CFH = ctx->LOsTocFH = InitDiscoverCompressFileHandle(tocfname, PG_BINARY_R);

Expand Down