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.

Sign up for GitHub

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

Jump to bottom

docs-cn for instance scoped system variables #8725

Merged
merged 19 commits into from
May 9, 2022
Merged

docs-cn for instance scoped system variables #8725

merged 19 commits into from
May 9, 2022

Conversation

CbcWestwolf
Copy link
Member

@CbcWestwolf CbcWestwolf commented Mar 22, 2022 •
edited by TomShawn
Loading

First-time contributors' checklist

What is changed, added or deleted? (Required)

It is translated from docs/pull#7897

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)
  • v6.0 (TiDB 6.0 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • 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)?

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
Copy link
Member

ti-chi-bot commented Mar 22, 2022 •
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.

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 March 22, 2022 07:31
@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 22, 2022
@TomShawn TomShawn added translation/from-docs This PR is translated from a PR in pingcap/docs. area/sql-infra Indicates that the Issue or PR belongs to the area of sql-infra and sql-metadata. for-future-release This PR only applies to master for now and might cherry-pick to a future release. type/compatibility-or-feature-change This PR involves compatibility changes or feature behavior changes. and removed missing-translation-status This PR does not have translation status info. labels Mar 22, 2022
@TomShawn TomShawn requested review from bb7133 and easonn7 March 22, 2022 09:50
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 25, 2022
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 31, 2022
@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 28, 2022
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 28, 2022
TomShawn
TomShawn reviewed Apr 28, 2022
View reviewed changes
CbcWestwolf and others added 2 commits April 28, 2022 17:35
@CbcWestwolf
Fix
361ffa0
@CbcWestwolf @TomShawn
Update system-variables.md
5a9921d 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
TomShawn
TomShawn reviewed Apr 28, 2022
View reviewed changes
Copy link
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.

Great job!

system-variables.md Outdated
@@ -45,19 +47,22 @@ SET GLOBAL tidb_distsql_scan_concurrency = 10;
### `allow_auto_random_explicit_insert` <span class="version-mark">从 v4.0.3 版本开始引入</span>

- 作用域：SESSION | GLOBAL
- 集群持久化：是
Copy link
Contributor

Choose a reason for hiding this comment

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

持久化到集群？

system-variables.md Outdated
@@ -1415,13 +1545,15 @@ SET tidb_query_log_max_len = 20;
### `tidb_retry_limit`

- 作用域：SESSION | GLOBAL
- 集群持久化：是
Copy link
Contributor

Choose a reason for hiding this comment

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

L1535 tidb_replica_read 漏加 “集群持久化：是”

@CbcWestwolf @TomShawn
Update system-variables.md
9df07b1 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
CbcWestwolf and others added 8 commits April 28, 2022 19:44
@CbcWestwolf @TomShawn
Update system-variables.md
3f2bab7 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@CbcWestwolf @TomShawn
Update system-variables.md
7800fe2 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@CbcWestwolf @TomShawn
Update system-variables.md
b1bb3ba 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@CbcWestwolf @TomShawn
Update system-variables.md
5c7be42 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@CbcWestwolf @TomShawn
Update system-variables.md
0d7ecae 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@CbcWestwolf @TomShawn
Update system-variables.md
b398668 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@CbcWestwolf
Rename
bcd6457
@CbcWestwolf
Merge branch 'add-instance-scope-variables-docs' of github.com:CbcWes…
0a47326 
…twolf/docs-cn into add-instance-scope-variables-docs
TomShawn
TomShawn approved these changes Apr 28, 2022
View reviewed changes
Copy link
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 ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 28, 2022
@TomShawn TomShawn added requires-followup This PR requires a follow-up task after being merged. v6.1 This PR/issue applies to TiDB v6.1. and removed for-future-release This PR only applies to master for now and might cherry-pick to a future release. labels Apr 28, 2022
bb7133
bb7133 approved these changes May 9, 2022
View reviewed changes
Copy link
Member

@bb7133 bb7133 left a comment

Choose a reason for hiding this comment

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

LGTM

@TomShawn
Copy link
Contributor

TomShawn commented May 9, 2022

/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 May 9, 2022
@TomShawn
Copy link
Contributor

TomShawn commented May 9, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 0a47326

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 9, 2022
@ti-chi-bot ti-chi-bot merged commit 8c5c352 into pingcap:master May 9, 2022
@CbcWestwolf CbcWestwolf deleted the add-instance-scope-variables-docs branch May 9, 2022 06:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bb7133 bb7133 bb7133 approved these changes

@TomShawn TomShawn TomShawn approved these changes

@easonn7 easonn7 Awaiting requested review from easonn7

Assignees
No one assigned
Labels
area/sql-infra Indicates that the Issue or PR belongs to the area of sql-infra and sql-metadata. requires-followup This PR requires a follow-up task after being merged. size/L Denotes a PR that changes 100-499 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. type/compatibility-or-feature-change This PR involves compatibility changes or feature behavior changes. v6.1 This PR/issue applies to TiDB v6.1.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@CbcWestwolf @ti-chi-bot @TomShawn @bb7133