Skip to content

Uniform name#6964

Merged
ti-chi-bot merged 2 commits into
pingcap:masterfrom
glkappe:patch-87
Aug 26, 2021
Merged

Uniform name#6964
ti-chi-bot merged 2 commits into
pingcap:masterfrom
glkappe:patch-87

Conversation

@glkappe
Copy link
Copy Markdown
Contributor

@glkappe glkappe commented Aug 25, 2021 •
edited
Loading

Uniform name
sql 变量 -> 系统变量（because link is "系统变量"）

First-time contributors' checklist

What is changed, added or deleted? (Required)

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

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions (in Chinese).

  • master (the latest development version)
  • v5.2 (TiDB 5.2 versions)
  • 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

@glkappe
Uniform name
b874c32 
Uniform name
sql 变量 -> 系统变量（because link is "系统变量"）
@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Aug 25, 2021 •
edited
Loading

[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 requested a review from TomShawn August 25, 2021 12:29
@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 25, 2021
@glkappe
Format change
55953d4 
Format change and fix wrong default value
```
slow-threshold
输出慢日志的耗时阈值。
默认值：300ms
当查询大于这个值，就会当做是一个慢查询，输出到慢查询日志。
```
https://docs.pingcap.com/zh/tidb/v5.0/tidb-configuration-file#slow-threshold
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 26, 2021
@TomShawn TomShawn added needs-cherry-pick-release-4.0 require-LGT1 Indicates that the PR requires an LGTM. translation/doing This PR’s assignee is translating this PR. type/bugfix This PR fixes a bug. and removed missing-translation-status This PR does not have translation status info. labels Aug 26, 2021
@TomShawn
Copy link
Copy Markdown
Contributor

TomShawn commented Aug 26, 2021

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Aug 26, 2021

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

DetailsCommit hash: 55953d4

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

ti-chi-bot commented Aug 26, 2021

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

@ti-chi-bot ti-chi-bot mentioned this pull request Aug 26, 2021
Merged
13 tasks
@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Aug 26, 2021

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

@ti-chi-bot ti-chi-bot mentioned this pull request Aug 26, 2021
Merged
13 tasks
@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Aug 26, 2021

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

@ti-chi-bot ti-chi-bot mentioned this pull request Aug 26, 2021
Merged
13 tasks
@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Aug 26, 2021

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

ti-chi-bot added a commit that referenced this pull request Aug 26, 2021
@ti-chi-bot
Uniform name (#6964) (#6971)
f126e3c
ti-chi-bot added a commit that referenced this pull request Aug 26, 2021
@ti-chi-bot
Uniform name (#6964) (#6969)
a66787d
ti-chi-bot added a commit that referenced this pull request Aug 26, 2021
@ti-chi-bot
Uniform name (#6964) (#6970)
b98af93
ti-chi-bot added a commit that referenced this pull request Aug 26, 2021
@ti-chi-bot
Uniform name (#6964) (#6968)
e0c17b2
@en-jin19 en-jin19 mentioned this pull request Aug 26, 2021
Merged
12 tasks
@en-jin19 en-jin19 added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR’s assignee is translating this PR. labels Aug 26, 2021
This was referenced Aug 31, 2021
Merged
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@TomShawn TomShawn TomShawn approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@en-jin19 en-jin19

Labels

require-LGT1 Indicates that the PR requires an LGTM. size/XS Denotes a PR that changes 0-9 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. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. type/bugfix This PR fixes a bug.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@glkappe @ti-chi-bot @TomShawn @en-jin19