PXC-5267: Code refresh for - PXC 8.4.11-11 - #15
Draft
jaideepkarande wants to merge 6 commits into
Draft
Conversation
Merge remote-tracking branch 'mariadb/master' into PXC_5267 History-only merge: mariadb/master carries merges of v26 whose content is already in percona/percona-4.x-8.0, so the tree is unchanged. mariadb/v26 was already up to date - no second merge commit.
jaideepkarande
marked this pull request as draft
August 20, 2026 07:17
This was referenced Aug 20, 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
3 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.
wsrep-API refresh for the PXC 8.4.11-11 release (PXC-5267).
This is the first of the three submodule PRs to merge — galera and wsrep-lib both carry pointers to the sha produced here, and neither resolves until this lands.
What this merges
mariadb-corporation/wsrep-APImastercf9c0a2cmariadb-corporation/wsrep-APIv26percona/percona-4.x-8.0; produced no commitNo conflicts.
The merge is history-only — the tree does not change
All five commits it brings in are upstream
Merge branch 'v26'/Merge remote-tracking branch 'origin/v26'up-merges, and each was checked withgit show --cc: none carries a single file of its own.c9ff2fc983417fe7b0d6d19dd8571b61a795700ecd18cf9c0a2cf1fgit diff percona/percona-4.x-8.0..PXC_5267is empty. So this PR records provenance — it aligns our branch with upstream's history so future merges have a common ancestor — and ships no behaviour change. That is stated explicitly because an empty diff with five commits otherwise looks like a mistake.Where the sha goes
f80a23b6642is consumed at two mount points, both nested inside other submodules:wsrep/srcwsrep-API/v26Bumping wsrep-API therefore moves the galera and wsrep-lib pointers as well, which is why those two PRs each contain a pointer commit and why this one merges first.
Merge order
Validation
wsrep-API is not built standalone; it is exercised through the PXC release runs of
pxc-8.x-pipeline-parallel-mtr, which build this exact sha as a nested submodule — #884 Debug, #885 RelWithDebInfo, #886 ASAN, #887 Valgrind. Since the tree is unchanged, nothing in those runs can be attributed to this PR. Full analysis on #2349.Related