Resolve conflicts in pg_proc.dat and pg_upgrade_support.c#2450
Open
RekGRpth wants to merge 1 commit intosync-14x-b12from
Open
Resolve conflicts in pg_proc.dat and pg_upgrade_support.c#2450RekGRpth wants to merge 1 commit intosync-14x-b12from
RekGRpth wants to merge 1 commit intosync-14x-b12from
Conversation
1) Commit f3faf35 in src/include/catalog/pg_proc.dat removed the declaration of the binary_upgrade_set_next_toast_pg_type_oid function, although the earlier commit 19cd1cf had already added two additional arguments to it. 2) Commit f3faf35 in src/backend/utils/adt/pg_upgrade_support.c removed the binary_upgrade_set_next_toast_pg_type_oid function, although the earlier commit 19cd1cf had already added two additional arguments, typnamespaceoid and typname.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Commit f3faf35 in src/include/catalog/pg_proc.dat removed the
declaration of the binary_upgrade_set_next_toast_pg_type_oid function,
although the earlier commit 19cd1cf had already added two additional
arguments to it.
Commit f3faf35 in src/backend/utils/adt/pg_upgrade_support.c removed
the binary_upgrade_set_next_toast_pg_type_oid function, although the
earlier commit 19cd1cf had already added two additional arguments,
typnamespaceoid and typname.