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.

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

Align 4 PRs #9393

Merged
merged 8 commits into from
May 13, 2022
Merged

Align 4 PRs #9393

merged 8 commits into from
May 13, 2022

Conversation

TomShawn
Copy link
Contributor

@TomShawn TomShawn commented May 10, 2022

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)
  • v6.1 (TiDB 6.1 versions)
  • 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)

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

@TomShawn TomShawn added type/enhancement This issue/PR improves documentation usability or supplements document content. 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. needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. needs-cherry-pick-release-6.0 labels May 10, 2022
@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 10, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • shichun-0415

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 added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 10, 2022
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 10, 2022
@TomShawn TomShawn changed the title Align 2 PRs Align 3 PRs May 10, 2022
system-variables.md Outdated Show resolved Hide resolved
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 10, 2022
@TomShawn TomShawn changed the title Align 3 PRs Align 4 PRs May 10, 2022
Co-authored-by: Aolin <aolinz@outlook.com>
mysql-compatibility.md Outdated Show resolved Hide resolved
Co-authored-by: Aolin <aolinz@outlook.com>
statistics.md Outdated Show resolved Hide resolved
statistics.md Outdated Show resolved Hide resolved
statistics.md Outdated Show resolved Hide resolved
system-variables.md Outdated Show resolved Hide resolved
mysql-compatibility.md Outdated Show resolved Hide resolved
mysql-compatibility.md Outdated Show resolved Hide resolved
releases/release-5.3.0.md Outdated Show resolved Hide resolved
statistics.md Outdated Show resolved Hide resolved
mysql-compatibility.md Outdated Show resolved Hide resolved
TomShawn and others added 2 commits May 12, 2022 20:42
Co-authored-by: shichun-0415 <89768198+shichun-0415@users.noreply.github.com>
Co-authored-by: Aolin <aolinz@outlook.com>
Co-authored-by: shichun-0415 <89768198+shichun-0415@users.noreply.github.com>
statistics.md Outdated Show resolved Hide resolved
Copy link
Contributor

@shichun-0415 shichun-0415 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 May 12, 2022
@TomShawn
Copy link
Contributor Author

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

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: c3145d9

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 13, 2022
@ti-chi-bot ti-chi-bot merged commit 2d6309c into pingcap:master May 13, 2022
@ti-chi-bot ti-chi-bot mentioned this pull request May 13, 2022
13 tasks
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot ti-chi-bot mentioned this pull request May 13, 2022
13 tasks
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot ti-chi-bot mentioned this pull request May 13, 2022
13 tasks
@ti-chi-bot
Copy link
Member

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

@TomShawn TomShawn deleted the mysql-sql-prs branch May 13, 2022 02:41
ti-chi-bot added a commit that referenced this pull request May 13, 2022
ti-chi-bot added a commit that referenced this pull request May 13, 2022
ti-chi-bot added a commit that referenced this pull request May 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/sql-infra Indicates that the Issue or PR belongs to the area of sql-infra and sql-metadata. needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. size/M Denotes a PR that changes 30-99 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/enhancement This issue/PR improves documentation usability or supplements document content.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants