MDEV-34195 tests: avoid LP64 MYSQL size assert on x32#4962
Open
aquilamacedo wants to merge 1 commit intoMariaDB:10.11from
Open
MDEV-34195 tests: avoid LP64 MYSQL size assert on x32#4962aquilamacedo wants to merge 1 commit intoMariaDB:10.11from
aquilamacedo wants to merge 1 commit intoMariaDB:10.11from
Conversation
x32 defines __x86_64__ but uses the ILP32 ABI, so the LP64 sizeof(MYSQL) == 1272 compile-time assert is selected incorrectly and breaks the build. Guard the x86_64 check with !defined(__ILP32__) so the LP64 size assert only applies to real amd64 LP64 builds, while leaving the existing Windows amd64 and i386 checks unchanged.
gkodinov
added
the
External Contribution
gkodinov
approved these changes
Apr 21, 2026
Member
gkodinov
left a comment
gkodinov
left a comment
There was a problem hiding this comment.
Thank you for your contribution! This is a preliminary review.
LGTM. Please stand by for the final review.
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.
x32 defines
__x86_64__but uses theILP32 ABI, so the LP64sizeof(MYSQL) == 1272compile-time assert is selected incorrectly for x32 builds and fails compilation.Guard the x86_64 check with
!defined(__ILP32__)so this assertion onlyapplies to real LP64 amd64 builds, while keeping the existing Windows amd64 and
i386 checks unchanged.
MDEV-34195