Skip to content

Resolve conflicts in defrem.h, parsenodes.h, indexcmds.c, utility.c#2561

Open
silent-observer wants to merge 1 commit into
sync-14x-b13from
sync-14x-b13-michkov-10
Open

Resolve conflicts in defrem.h, parsenodes.h, indexcmds.c, utility.c#2561
silent-observer wants to merge 1 commit into
sync-14x-b13from
sync-14x-b13-michkov-10

Conversation

@silent-observer
Copy link
Copy Markdown

  1. Commit a6642b3 removed "concurrent" field
    from ReindexStmt and switched to using bitflags. Update the rest of the code.

  2. Commit a6642b3 added topLevel argument,
    however this commit was already cherry-picked as
    67a7c0f, but using "concurrent" argument, and
    without REINDEXOPT_MISSING_OK option added in
    1d65416, and also without the fix from commit d1b0007.

1. Commit a6642b3 removed "concurrent" field
from ReindexStmt and switched to using bitflags. Update the rest of the code.

2. Commit a6642b3 added topLevel argument,
however this commit was already cherry-picked as
67a7c0f, but using "concurrent" argument, and
without REINDEXOPT_MISSING_OK option added in
1d65416, and also without the fix from commit
d1b0007.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants