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

The mysql version check inverted #51240

Closed
wants to merge 2 commits into from
Closed

The mysql version check inverted #51240

wants to merge 2 commits into from

Conversation

waynegemmell
Copy link
Contributor

The mysql version check that was supposed to test whether the version is greater than or equal to 8.0.11 was testing for less than or equal to 8.0.11. This then used the password(_) function in the incorrect context.

Tests written?

No

Commits signed with GPG?

No

is greater than or equal to 8.0.11 was testing for less than or equal
to 8.0.11. This then used the password(_) function in the incorrect context.
@waynegemmell
Copy link
Contributor Author

This was supposed to go in against tag 2018.3.3. I'm not sure what went wrong. Selecting the tag on the pull request screen sent me into a code comparison mode.

@waynegemmell waynegemmell changed the title The mysql version check that was supposed to test whether the version The mysql version check inverted Jan 18, 2019
waynegemmell pushed a commit to waynegemmell/mysql-formula that referenced this pull request Jan 18, 2019
I've added support for the official mysql 8.0 packages and the relevant repositories.
Package names are mysql-community-server and mysql-community-client.
I know the repo setting breaks convention a bit but it is compulsory so I'm not sure how else to properly include it.

This change requires the salt pull request I created saltstack/salt#51240 to be able to grant users.
@@ -1242,7 +1242,7 @@ def user_exists(user,
else:
qry += ' AND ' + password_column + ' = \'\''
elif password:
if salt.utils.versions.version_cmp(server_version, '8.0.11') <= 0:
if salt.utils.versions.version_cmp(server_version, '8.0.11') >= 0:
Copy link
Contributor

Choose a reason for hiding this comment

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

what about salt.utils.versions.LooseVersion(server_version) >= '8.0.11'

@garethgreenaway garethgreenaway changed the base branch from develop to 2018.3 January 18, 2019 22:50
@garethgreenaway garethgreenaway changed the base branch from 2018.3 to develop January 18, 2019 22:53
@garethgreenaway garethgreenaway changed the base branch from develop to 2018.3 January 18, 2019 22:54
@garethgreenaway garethgreenaway changed the base branch from 2018.3 to develop January 18, 2019 22:54
@garethgreenaway
Copy link
Contributor

garethgreenaway commented Jan 18, 2019

@waynegemmell Looks like your local branch was against develop, switching the base branch in the PR results in a lot of changes beyond your change. That's okay though, we can merge this into develop then back port it to 2018.3. There was one merge conflict that I took care of.

@garethgreenaway garethgreenaway added the bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch label Jan 18, 2019
@garethgreenaway
Copy link
Contributor

Looking closer at the code already committed, this was fixed in #49918.
Closing this PR out.

@waynegemmell waynegemmell deleted the fix-mysql-version-check branch January 19, 2019 21:51
@waynegemmell waynegemmell restored the fix-mysql-version-check branch January 19, 2019 21:52
@waynegemmell waynegemmell deleted the fix-mysql-version-check branch January 21, 2019 07:45
@garethgreenaway garethgreenaway removed the bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch label Jan 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants