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

*: Show edition information when mysql client login (#17170) #17187

Merged
merged 1 commit into from
May 14, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented May 14, 2020

cherry-pick #17170 to release-4.0


Signed-off-by: Lonng heng@lonng.org

What problem does this PR solve?

Show edition information when MySQL client login and tidb-server -V

Problem Summary:

TiDB needs to distinguish Enterprise and Community editions after v4.0.0 GA, and print the edition information when user login via MySQL client.

What is changed and how it works?

  1. Change the Makefile to change the edition according to environment variables.
  2. Change the version_comment session variable.
Welcome to the MySQL monitor.  Commands end with ; or \g.
Your MySQL connection id is 1
Server version: 5.7.25-TiDB-v4.0.0 TiDB Server (Apache License 2.0) Enterprise Edition, MySQL 5.7 compatible

Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.

Oracle is a registered trademark of Oracle Corporation and/or its
affiliates. Other names may be trademarks of their respective
owners.

Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.

Tests

  • Unit test
  • No code

Release note

  • No need

@sre-bot
Copy link
Contributor Author

sre-bot commented May 14, 2020

/run-all-tests

Copy link
Contributor

@zhangjinpeng87 zhangjinpeng87 left a comment

Choose a reason for hiding this comment

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

LGTM

@lonng
Copy link
Contributor

lonng commented May 14, 2020

/run-common-test

@lonng lonng merged commit 12aac54 into pingcap:release-4.0 May 14, 2020
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.

4 participants