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

v6.1.11 #1

Open
wants to merge 14 commits into
base: hunter
Choose a base branch
from
Open

v6.1.11 #1

wants to merge 14 commits into from

Conversation

ned14
Copy link

@ned14 ned14 commented Mar 11, 2021

Merged v6.1.1, the last non-Oracle release.

Split exported libraries into mysql_shared and mysql_static

@ned14
Copy link
Author

ned14 commented Apr 23, 2021

@rbsheth A reminder that this PR has been awaiting review for well over a month now. Apologies for pinging you.

@rbsheth
Copy link
Member

rbsheth commented Apr 23, 2021

@ned14 No worries, you should ping me or I won't see it. Looks like there are conflicts?

@ned14
Copy link
Author

ned14 commented Apr 23, 2021

@ned14 No worries, you should ping me or I won't see it. Looks like there are conflicts?

Oh I didn't know that, sorry. I just assumed you always see all PRs.

I think the conflicts are from the CRLF cleanup and the new .gitattributes to ensure CRLF mismatch doesn't happen again. It's possible the conflicts are instead from the rebase, so I took Ruslan's original delta from trunk, and rebased it onto the last open source release. So that would appear here as a rebase rather than merge i.e. conflict.

@rbsheth
Copy link
Member

rbsheth commented Apr 11, 2022

@ned14 Seeing some activity here. Still working on those conflicts?

@ned14
Copy link
Author

ned14 commented Apr 11, 2022

@ned14 Seeing some activity here. Still working on those conflicts?

Actually no. I have been fixing problems in the work code base. The recent commits do fix useful things needing fixing however.

@ned14
If WITH_SSL is specified to cmake, do not bind in a copy of the SSL l…
51c9987 
…ibraries

to the MySQL static library as this will produce symbol collisions in anything
consuming the MySQL library and the SSL libraries.

Also fix a build failure in debug builds if WITH_SSL is specified.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ned14 @rbsheth @caseymcc