Skip to content

system-variables: add datadir and license (#5761)#5890

Merged
ti-chi-bot merged 1 commit into
pingcap:release-5.1from
ti-chi-bot:cherry-pick-5761-to-release-5.1
Jun 29, 2021
Merged

system-variables: add datadir and license (#5761)#5890
ti-chi-bot merged 1 commit into
pingcap:release-5.1from
ti-chi-bot:cherry-pick-5761-to-release-5.1

Conversation

@ti-chi-bot
Copy link
Copy Markdown
Member

This is an automated cherry-pick of #5761

What is changed, added or deleted? (Required)

This adds 2 missing system variables that function correctly in TiDB: datadir and license.

The language is intentionally a little vague and says "typically" because in mocktikv/unistore cases it will show a path, but that is for developers to know. I don't believe we ever change the license string for enterprise edition but the language doesn't preclude that.

Which TiDB version(s) do your changes apply to? (Required)

  • master (the latest development version)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

What is the related PR or file link(s)?

  • This PR is translated from:
  • Other reference link(s):

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/cherry-pick-for-release-5.1 This PR is cherry-picked to release-5.1 from a source PR. labels Jun 29, 2021
@ti-chi-bot ti-chi-bot requested a review from TomShawn June 29, 2021 07:58
@ti-chi-bot
Copy link
Copy Markdown
Member Author

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • TomShawn

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Details

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 29, 2021
@TomShawn
Copy link
Copy Markdown
Contributor

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member Author

This pull request has been accepted and is ready to merge.

DetailsCommit hash: 702a35c

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 29, 2021
@ti-chi-bot ti-chi-bot merged commit b718358 into pingcap:release-5.1 Jun 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/cherry-pick-for-release-5.1 This PR is cherry-picked to release-5.1 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants