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

*: update some sentences. #5346

Merged
merged 1 commit into from
Apr 15, 2021
Merged

*: update some sentences. #5346

merged 1 commit into from
Apr 15, 2021

Conversation

bb7133
Copy link
Member

@bb7133 bb7133 commented Apr 15, 2021

What is changed, added or deleted? (Required)

A tiny update to modify some sentences.

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

  • 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 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 Apr 15, 2021
@djshow832
Copy link
Contributor

/lgtm

@ti-chi-bot
Copy link
Member

@djshow832: /lgtm is only allowed for the reviewers in list.

In response to this:

/lgtm

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member

@xiongjiwei: /lgtm is only allowed for the reviewers in list.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@TomShawn
Copy link
Contributor

/assign
/label needs-cherry-pick-5.0
/label needs-cherry-pick-4.0
/translation doing
/label require-LGT1
/lgtm

@ti-chi-bot ti-chi-bot added translation/doing This PR's assignee is translating this PR. needs-cherry-pick-5.0 labels Apr 15, 2021
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot ti-chi-bot added needs-cherry-pick-4.0 require-LGT1 Indicates that the PR requires an LGTM. status/LGT1 Indicates that a PR has LGTM 1. and removed missing-translation-status This PR does not have translation status info. labels Apr 15, 2021
@TomShawn
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: be1a0d2

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 15, 2021
@ti-chi-bot ti-chi-bot merged commit 568da86 into pingcap:master Apr 15, 2021
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Apr 15, 2021
@bb7133 @ti-srebot
cherry pick pingcap#5346 to release-4.0
524817c 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Apr 15, 2021
Merged
10 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #5347

ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Apr 15, 2021
@bb7133 @ti-srebot
cherry pick pingcap#5346 to release-5.0
4c25f2b 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Apr 15, 2021
Merged
10 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #5348

ti-chi-bot pushed a commit that referenced this pull request Apr 15, 2021
@ti-srebot
*: update some sentences. (#5346) (#5348)
1cc97be
ti-chi-bot pushed a commit that referenced this pull request Apr 15, 2021
@ti-srebot
*: update some sentences. (#5346) (#5347)
940cb75
morgo
morgo reviewed Apr 15, 2021
View reviewed changes
error-codes.md
@@ -98,7 +98,7 @@ TiDB is compatible with the error codes in MySQL, and in most cases returns the

* Error Number: 8027

The table schema version is outdated. TiDB uses the F1 online schema change algorithm to execute DDL statements. When the table schema version of the TiDB server is earlier than that of the entire system, this error is returned if you execute a SQL statement.
The table schema version is outdated. TiDB uses the online schema change algorithm to execute DDL statements. When the table schema version of the TiDB server is earlier than that of the entire system, this error is returned if you execute a SQL statement.
Copy link
Contributor

Choose a reason for hiding this comment

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

I think because F1 is removed, "the" should also be removed because otherwise it implies there is only one algorithm to perform online schema change, which is not true.

Thus the text can be further simplified to something like:
"TiDB applies schema changes online. When the table schema version of the TiDB server is earlier than the.."

Copy link
Contributor

Choose a reason for hiding this comment

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

Updated in #5352.

@TomShawn TomShawn mentioned this pull request Apr 21, 2021
Merged
10 tasks
@TomShawn
Copy link
Contributor

/translation done
/remove-translation doing

@ti-chi-bot ti-chi-bot 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 Apr 21, 2021
This was referenced Apr 21, 2021
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@morgo morgo morgo left review comments

@TomShawn TomShawn TomShawn left review comments

@xiongjiwei xiongjiwei xiongjiwei approved these changes

Assignees

@TomShawn TomShawn

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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@bb7133 @djshow832 @ti-chi-bot @TomShawn @ti-srebot @morgo @xiongjiwei