Skip to content

system-variables: add datadir and license#6573

Merged
ti-chi-bot merged 3 commits into
pingcap:masterfrom
Liuxiaozhen12:add-datadir-and-license
Jul 5, 2021
Merged

system-variables: add datadir and license#6573
ti-chi-bot merged 3 commits into
pingcap:masterfrom
Liuxiaozhen12:add-datadir-and-license

Conversation

@Liuxiaozhen12
Copy link
Copy Markdown
Contributor

@Liuxiaozhen12 Liuxiaozhen12 commented Jul 1, 2021

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)?

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 requested a review from TomShawn July 1, 2021 07:50
@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 1, 2021
@Liuxiaozhen12
Copy link
Copy Markdown
Contributor Author

Liuxiaozhen12 commented Jul 1, 2021

/label needs-cherry-pick-release-4.0
/label needs-cherry-pick-release-5.0
/label needs-cherry-pick-release-5.1
/translation from-docs

@ti-chi-bot ti-chi-bot added translation/from-docs This PR is translated from a PR in pingcap/docs. needs-cherry-pick-release-4.0 and removed missing-translation-status This PR does not have translation status info. labels Jul 1, 2021
@Liuxiaozhen12 Liuxiaozhen12 requested a review from xhebox July 1, 2021 07:52
TomShawn
TomShawn reviewed Jul 1, 2021
View reviewed changes
Comment thread system-variables.md Outdated
TomShawn
TomShawn reviewed Jul 1, 2021
View reviewed changes
Comment thread system-variables.md Outdated
@TomShawn TomShawn added the status/require-change Needs the author to address comments. label Jul 1, 2021
@Liuxiaozhen12 @TomShawn
Apply suggestions from code review
1d123a5 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@Liuxiaozhen12 Liuxiaozhen12 requested a review from TomShawn July 2, 2021 08:06
xhebox
xhebox reviewed Jul 2, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@xhebox xhebox left a comment

Choose a reason for hiding this comment

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

Rest LGTM

Comment thread system-variables.md Outdated
@TomShawn TomShawn removed the status/require-change Needs the author to address comments. label Jul 5, 2021
TomShawn
TomShawn approved these changes Jul 5, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@TomShawn TomShawn left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Jul 5, 2021

[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 Jul 5, 2021
@TomShawn
Copy link
Copy Markdown
Contributor

TomShawn commented Jul 5, 2021

/remove-status LGT1
/status LGT2

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 5, 2021
@TomShawn
Copy link
Copy Markdown
Contributor

TomShawn commented Jul 5, 2021

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Jul 5, 2021

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

DetailsCommit hash: 6c6ed5a

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 5, 2021
@ti-chi-bot ti-chi-bot merged commit fa75bd8 into pingcap:master Jul 5, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request Jul 5, 2021
Merged
11 tasks
@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Jul 5, 2021

In response to a cherrypick label: new pull request created: #6581.

ti-chi-bot pushed a commit to ti-chi-bot/docs-cn that referenced this pull request Jul 5, 2021
@Liuxiaozhen12 @ti-chi-bot
This is an automated cherry-pick of pingcap#6573
c4b14ba 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Jul 5, 2021
Merged
11 tasks
@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Jul 5, 2021

In response to a cherrypick label: new pull request created: #6582.

@ti-chi-bot ti-chi-bot mentioned this pull request Jul 5, 2021
Merged
11 tasks
@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Jul 5, 2021

In response to a cherrypick label: new pull request created: #6583.

ti-chi-bot added a commit that referenced this pull request Jul 5, 2021
@ti-chi-bot
system-variables: add datadir and license (#6573) (#6581)
75ffaa5
ti-chi-bot added a commit that referenced this pull request Jul 5, 2021
@ti-chi-bot
system-variables: add datadir and license (#6573) (#6582)
49d1567
ti-chi-bot added a commit that referenced this pull request Jul 5, 2021
@ti-chi-bot
system-variables: add datadir and license (#6573) (#6583)
b6f86b5
3AceShowHand pushed a commit to 3AceShowHand/docs-cn that referenced this pull request Jul 27, 2021
@Liuxiaozhen12 @3AceShowHand
system-variables: add datadir and license (pingcap#6573)
6f294db
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@xhebox xhebox xhebox left review comments

+1 more reviewer

@TomShawn TomShawn TomShawn approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

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/LGT2 Indicates that a PR has LGTM 2. translation/from-docs This PR is translated from a PR in pingcap/docs.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Liuxiaozhen12 @ti-chi-bot @TomShawn @xhebox