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.

Sign up for GitHub

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

Jump to bottom

MDEV-23230 wsrep files installed when built without WSREP #2334

Merged
merged 1 commit into from
Nov 28, 2022
Merged

MDEV-23230 wsrep files installed when built without WSREP #2334

merged 1 commit into from
Nov 28, 2022

Conversation

grooverdan
Copy link
Member

@grooverdan grooverdan commented Nov 17, 2022 •
edited

Prevent wsrep files from being installed if WITH_WSREP=OFF.

Based on patch attached by Chris in MDEV. Changes STRING(APPEND to set as older CMake still needs to be supported.

Additionally excluded Include wsrep files and galera* files.

Tested with:

 rm -rf /tmp/ddd; cmake -DWITH_WSREP=OFF . ; cmake --build . ; cmake --install . --prefix=/tmp/ddd; find /tmp/ddd -name \*wsrep\* -o -name \*galera\*
 ...
 /tmp/ddd/mysql-test/include/have_wsrep_enabled.inc
/tmp/ddd/mysql-test/include/have_wsrep_provider.inc
/tmp/ddd/mysql-test/include/have_wsrep.inc
/tmp/ddd/mysql-test/suite/rpl/r/mysql-wsrep#110-2.result
/tmp/ddd/mysql-test/suite/rpl/t/mysql-wsrep#110-2.test

have_wsrep.inc is included by a few spurious tests.

@CLAassistant
Copy link

CLAassistant commented Nov 17, 2022 •
edited

CLA assistant check
All committers have signed the CLA.

@grooverdan
Copy link
Member Author

Note: MCA license acceptance in JIRA

@grooverdan grooverdan force-pushed the bb-10.5-danielblack-MDEV-23230-wsrep branch 3 times, most recently from 837ccf6 to d0076ed Compare November 18, 2022 14:22
@cross-cisco
Copy link
Contributor

Anything preventing this going in? Just curious, so it can be pulled into 10.6 and later as well.

@cross-cisco @LinuxJedi
MDEV-23230 wsrep files installed when built without WSREP
3bb1969 
Prevent wsrep files from being installed if WITH_WSREP=OFF.

Reviewed by Daniel Black
Additionally excluded #include wsrep files and galera* files
along with galera/wsrep tests.

mysql-test/include/have_wsrep.inc remainds as its used by
a few isolated tests.
@LinuxJedi LinuxJedi force-pushed the bb-10.5-danielblack-MDEV-23230-wsrep branch from d0076ed to 3bb1969 Compare November 28, 2022 14:44
@LinuxJedi
Copy link
Contributor

Anything preventing this going in? Just curious, so it can be pulled into 10.6 and later as well.

There was a bug in the initial commit, I'm literally reviewing the updated commit right now :)

@LinuxJedi LinuxJedi merged commit 7b44d0b into MariaDB:10.5 Nov 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LinuxJedi LinuxJedi LinuxJedi approved these changes

Assignees

@LinuxJedi LinuxJedi

Labels
None yet
Milestone
No milestone
4 participants
@grooverdan @CLAassistant @cross-cisco @LinuxJedi