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

Synchronize two changes in docs-cn/pull/5856 #5148

Merged
merged 2 commits into from
Mar 29, 2021
Merged

Synchronize two changes in docs-cn/pull/5856 #5148

merged 2 commits into from
Mar 29, 2021

Conversation

qiancai
Copy link
Collaborator

@qiancai qiancai commented Mar 29, 2021

First-time contributors' checklist

What is changed, added or deleted? (Required)

Synchronize two changes made in pingcap/docs-cn#5856 to English

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

  • master (the latest development version)
  • 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 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 Mar 29, 2021
@qiancai
Copy link
Collaborator Author

qiancai commented Mar 29, 2021

/cc @ran-huang

@qiancai
Copy link
Collaborator Author

qiancai commented Mar 29, 2021

/translation from-docs-cn
/label v5.0
/label needs-cherry-pick-5.0

@ti-chi-bot ti-chi-bot added translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. v5.0 This PR/issue applies to TiDB v5.0. needs-cherry-pick-5.0 and removed missing-translation-status This PR does not have translation status info. labels Mar 29, 2021
@ran-huang
Copy link
Contributor

/label require-LGT1
/lgtm

@ti-chi-bot ti-chi-bot added require-LGT1 Indicates that the PR requires an LGTM. status/LGT1 Indicates that a PR has LGTM 1. labels Mar 29, 2021
@ran-huang
Copy link
Contributor

/lgtm cancel

@ti-chi-bot ti-chi-bot removed the status/LGT1 Indicates that a PR has LGTM 1. label Mar 29, 2021
ran-huang
ran-huang reviewed Mar 29, 2021
View reviewed changes
error-codes.md Outdated
@@ -178,7 +178,7 @@ TiDB is compatible with the error codes in MySQL, and in most cases returns the

* Error Number: 8055

The current snapshot is too old. The data may have been garbage collected. You can increase the value of [`tidb_gc_life_time`](/system-variables.md#tidb_gc_life_time-new-in-v50-ga) to avoid this problem. The new version of TiDB automatically reserves data for long-running transactions. Usually this error does not occur.
The current snapshot is too old. The data may have been garbage collected. You can increase the value of [`tidb_gc_life_time`](/system-variables.md#tidb_gc_life_time-new-in-v50-ga) to avoid this problem. Starting from TiDB v4.0.8, TiDB automatically reserves data for long-running transactions. Usually this error does not occur.
Copy link
Contributor

Choose a reason for hiding this comment

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

We should leave no version-specific description in the master

@ran-huang
Copy link
Contributor

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • ran-huang

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

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

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 00826ad

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 29, 2021
@ti-chi-bot ti-chi-bot merged commit d1ab711 into pingcap:master Mar 29, 2021
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Mar 29, 2021
@qiancai @ti-srebot
cherry pick pingcap#5148 to release-5.0
0e43a87 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Mar 29, 2021
Merged
11 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #5149

ti-chi-bot pushed a commit that referenced this pull request Mar 29, 2021
@ti-srebot
Synchronize two changes in docs-cn/pull/5856 (#5148) (#5149)
34e4006
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ran-huang ran-huang ran-huang left review comments

Assignees
No one assigned
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/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. v5.0 This PR/issue applies to TiDB v5.0.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@qiancai @ran-huang @ti-chi-bot @ti-srebot