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

Fix a typo in Update character-set-and-collation.md #6124

Merged
merged 1 commit into from
Apr 23, 2021
Merged

Fix a typo in Update character-set-and-collation.md #6124

merged 1 commit into from
Apr 23, 2021

Conversation

Joyinqin
Copy link
Contributor

@Joyinqin Joyinqin commented Apr 23, 2021 •
edited
Loading

First-time contributors' checklist

What is changed, added or deleted? (Required)

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

Fix a typo in Update character-set-and-collation.md

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 April 23, 2021 10:25
@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 23, 2021
@Joyinqin
Copy link
Contributor Author

/label needs-cherry-pick-5.0
/label needs-cherry-pick-4.0
/label needs-cherry-pick-3.0
/label needs-cherry-pick-2.1
/label needs-cherry-pick-3.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-5.0 and removed missing-translation-status This PR does not have translation status info. labels Apr 23, 2021
@TomShawn
Copy link
Contributor

/label require-LGT1
/lgtm

@ti-chi-bot ti-chi-bot added the require-LGT1 Indicates that the PR requires an LGTM. label Apr 23, 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 the status/LGT1 Indicates that a PR has LGTM 1. label Apr 23, 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: 706e410

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 23, 2021
@ti-chi-bot ti-chi-bot merged commit 41d6eac into pingcap:master Apr 23, 2021
ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Apr 23, 2021
@Joyinqin @ti-srebot
cherry pick pingcap#6124 to release-2.1
b5d2cac 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Apr 23, 2021
Merged
11 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-2.1 in PR #6125

ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Apr 23, 2021
@Joyinqin @ti-srebot
cherry pick pingcap#6124 to release-3.0
01bbf90 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Apr 23, 2021
Merged
11 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-3.0 in PR #6126

ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Apr 23, 2021
@Joyinqin @ti-srebot
cherry pick pingcap#6124 to release-3.1
42f7e9c 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Apr 23, 2021
Merged
11 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-3.1 in PR #6127

ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Apr 23, 2021
@Joyinqin @ti-srebot
cherry pick pingcap#6124 to release-4.0
bc715f4 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Apr 23, 2021
Merged
11 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #6128

ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Apr 23, 2021
@Joyinqin @ti-srebot
cherry pick pingcap#6124 to release-5.0
7bfcd4a 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Apr 23, 2021
Merged
11 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #6129

ti-chi-bot pushed a commit that referenced this pull request Apr 23, 2021
@ti-srebot
Fix a typo in Update character-set-and-collation.md (#6124) (#6128)
18d53b9
ti-chi-bot pushed a commit that referenced this pull request Apr 23, 2021
@ti-srebot
Fix a typo in Update character-set-and-collation.md (#6124) (#6129)
8b66045
@Joyinqin
Copy link
Contributor Author

@TomShawn All cp conflicts are addressed. PTAL thx~

@Joyinqin Joyinqin deleted the sql-patch branch April 23, 2021 13:09
ti-chi-bot pushed a commit that referenced this pull request Apr 25, 2021
@ti-srebot
Fix a typo in Update character-set-and-collation.md (#6124) (#6125)
d6a08f1
ti-chi-bot pushed a commit that referenced this pull request Apr 25, 2021
@ti-srebot
Fix a typo in Update character-set-and-collation.md (#6124) (#6126)
2bcdad2
ti-chi-bot pushed a commit that referenced this pull request Apr 25, 2021
@ti-srebot
Fix a typo in Update character-set-and-collation.md (#6124) (#6127)
8f93f11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TomShawn TomShawn Awaiting requested review from TomShawn

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 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
@Joyinqin @TomShawn @ti-chi-bot @ti-srebot