Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix build with WITH_EXTRA_CHARSETS=none in cmake #3216

Merged
merged 1 commit into from
Apr 24, 2024

Conversation

mscdex
Copy link
Contributor

@mscdex mscdex commented Apr 22, 2024

  • The Jira issue number for this PR is: MDEV-______

Description

This fixes cmake-based builds with -DWITH_EXTRA_CHARSETS=none, which results in a CHARSETS list that does not include ucs2, utf16, or utf32.

Release Notes

"Building with CMake and -DWITH_EXTRA_CHARSETS=none now works"

How can this PR be tested?

Compiling with cmake with -DWITH_EXTRA_CHARSETS=none.

Basing the PR against the correct MariaDB version

  • This is a new feature and the PR is based against the latest MariaDB development branch.
  • This is a bug fix and the PR is based against the earliest maintained branch in which the bug can be reproduced.

Erm well... the contributing info says to target the "master branch" but no such thing exists, so I targeted the current default branch (11.5 as of this writing). However, the problem exists in all previous version branches as well (I was trying to compile 10.11).

PR quality check

  • I checked the CODING_STANDARDS.md file and my PR conforms to this where appropriate.
  • For any trivial modifications to the PR, I am ok with the reviewer making the changes themselves.

@CLAassistant
Copy link

CLAassistant commented Apr 22, 2024

CLA assistant check
All committers have signed the CLA.

@LinuxJedi
Copy link
Contributor

Hi mscdex,

Erm well... the contributing info says to target the "master branch" but no such thing exists, so I targeted the current default branch (11.5 as of this writing). However, the problem exists in all previous version branches as well (I was trying to compile 10.11).

Can you please point to where we mention a master branch so that we can fix this? We definitely don't have one.

It needs to target the oldest supported version of MariaDB because commits are merged up from there to the newer versions. In this case the bug appears to be introduced in 10.10 but 10.11 is the oldest supported version with it, in which case the target should be 10.11.

We can do the rebase for you if you wish, or you can rebase this change against 10.11 in this PR.

@mscdex mscdex changed the base branch from 11.5 to 10.11 April 22, 2024 15:11
@mscdex
Copy link
Contributor Author

mscdex commented Apr 22, 2024

Can you please point to where we mention a master branch so that we can fix this? We definitely don't have one.

I believe it was this line from here:

In general all development is done on the master branch first, and later high-priority bug fixes might be backported to stable release branches (10.5, 10.4, 10.3, 10.2, 10.1).

rebase this change against 10.11 in this PR

Done.

@grooverdan
Copy link
Member

While I'm all for a fix, and it looks good. What's the use case of WITH_EXTRA_CHARSETS=none for you @mscdex ? It looks like someone many years ago went in a very liberal proving of compile options, so I'm slightly surprised they are used.

@mscdex
Copy link
Contributor Author

mscdex commented Apr 23, 2024

What's the use case of WITH_EXTRA_CHARSETS=none for you @mscdex ?

Just trying to slim down a generated OS image everywhere I can and the extra character sets I don't need as really only utf8mb4 and latin1 will be used.

@LinuxJedi
Copy link
Contributor

Can you please point to where we mention a master branch so that we can fix this? We definitely don't have one.

I believe it was this line from here:

In general all development is done on the master branch first, and later high-priority bug fixes might be backported to stable release branches (10.5, 10.4, 10.3, 10.2, 10.1).

Many thanks! Not sure who wrote it, but this one is definitely incorrect. I'll get this fixed later today.

Copy link
Contributor

@LinuxJedi LinuxJedi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks again for the information and for moving it to 10.11 so quickly.

@grooverdan grooverdan enabled auto-merge (rebase) April 23, 2024 07:00
@grooverdan
Copy link
Member

@mscdex to merge this we need either "Maintainers are allowed to edit this pull request." on the PR so we can rebase this, or if you rebase this yourself we've got a small window to enable auto-merge before someone else commits to the 10.11 branch.

Thanks for your contribution.

auto-merge was automatically disabled April 24, 2024 07:59

Head branch was pushed to by a user without write access

@mscdex
Copy link
Contributor Author

mscdex commented Apr 24, 2024

I've rebased.

@grooverdan grooverdan enabled auto-merge (rebase) April 24, 2024 08:06
@grooverdan
Copy link
Member

thanks. Automerge renabled.

@grooverdan grooverdan merged commit fb9af3f into MariaDB:10.11 Apr 24, 2024
11 of 15 checks passed
@mscdex mscdex deleted the fix-extra-charsets-none branch April 25, 2024 23:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
4 participants