Merge conflict resolution for MDEV-40365 & co. → 12.3 - #5551
Open
ParadoxV5 wants to merge 45 commits into
Open
Conversation
wsrep_provider_plugin_init() marked wsrep_provider_options read only by mutating the sys_var's flags directly, instead of going through the sys_var layer. Since MDEV-40341 move_allocated_sysvars_to_root() moves the value of every read only global string sysvar into the read only memroot and clears the ALLOCATED flag. wsrep_provider_options_init() then called my_free() on memroot memory, which aborted on the garbage allocation header. Remove the flag mutation instead of working around its effects. wsrep_provider_options stays a normal read-write variable and is kept in sync with the provider whenever a plugin sysvar changes. SET on wsrep_provider_options is still rejected while the wsrep-provider plugin is loaded, via the existing wsrep_provider_options_check() function. Its error message now states the real reason instead of "is a read only variable", which was misleading: the variable is not statically read only, and information_schema correctly reports READ_ONLY=NO for it.
s3.clone needs to source create_database.inc so that it can run in a high-concurrency environment where multiple MTR invocations are happening at the same time, while only a single S3 bucket (the S3 DB) is shared among all instances.
ParadoxV5
added
MariaDB Corporation
Replication
Merge conflict resolution with MDEV-32570, MDEV-34705
ParadoxV5
force-pushed
the
MDEV-40365.12.3
branch
from
August 15, 2026 01:28
8529371 to
de42d87
Compare
sanja-byelkin
force-pushed
the
bb-12.3-release
branch
from
August 20, 2026 06:28
6b8e55a to
83e909f
Compare
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
4 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.
#5465 →