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

[Enhancement] Compatible with mariadb client for ldap user login (backport #55720) #55817

Merged
merged 2 commits into from
Feb 14, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 11, 2025

Why I'm doing:

What I'm doing:

To compatible for mariadb client.
mysql_clear_password cannot be specified in mariadb client, so if the user is a ldap user, switch to mysql_clear_password plugin.

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

)

Signed-off-by: gengjun-git <[email protected]>
(cherry picked from commit fc39755)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/mysql/MysqlProto.java
@mergify mergify bot added the conflicts label Feb 11, 2025
Copy link
Contributor Author

mergify bot commented Feb 11, 2025

Cherry-pick of fc39755 has failed:

On branch mergify/bp/branch-3.4/pr-55720
Your branch is up to date with 'origin/branch-3.4'.

You are currently cherry-picking commit fc39755dd.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   fe/fe-core/src/main/java/com/starrocks/common/Config.java
	modified:   fe/fe-core/src/main/java/com/starrocks/mysql/MysqlHandshakePacket.java
	modified:   fe/fe-core/src/main/java/com/starrocks/mysql/NegotiateState.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/mysql/MysqlProto.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Contributor Author

mergify bot commented Feb 11, 2025

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

Signed-off-by: gengjun-git <[email protected]>
@gengjun-git gengjun-git reopened this Feb 12, 2025
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) February 12, 2025 03:17
@wanpengfei-git wanpengfei-git merged commit 16747db into branch-3.4 Feb 14, 2025
45 of 47 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.4/pr-55720 branch February 14, 2025 04:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants