Resolve conflicts in src/backend/commands/functioncmds.c#2569
Merged
Conversation
1) Commit 2453ea1 in src/backend/commands/functioncmds.c in the interpret_function_parameter_list function renamed the local variable inTypes to sigArgTypes. However, the earlier commit 6b0e52b had already added a pre-allocation comment in the same location. 2) Commit 2453ea1 in src/backend/commands/functioncmds.c in the interpret_function_parameter_list function renamed the local variable inTypes to sigArgTypes, changed the word input to signature in the error message, and removed the assignment to isinput. However, the earlier commit fa287d0 had already added a conditional increment of multisetCount in the same location.
silent-observer
approved these changes
May 22, 2026
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
2 participants
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 2453ea1 in src/backend/commands/functioncmds.c in the
interpret_function_parameter_list function renamed the local variable
inTypes to sigArgTypes. However, the earlier commit 6b0e52b had already
added a pre-allocation comment in the same location.
Commit 2453ea1 in src/backend/commands/functioncmds.c in the
interpret_function_parameter_list function renamed the local variable
inTypes to sigArgTypes, changed the word input to signature in the
error message, and removed the assignment to isinput. However, the
earlier commit fa287d0 had already added a conditional increment of
multisetCount in the same location.