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

hide the config global-kill #5770

Merged
merged 5 commits into from
Mar 19, 2021
Merged

hide the config global-kill #5770

merged 5 commits into from
Mar 19, 2021

Conversation

XuHuaiyu
Copy link
Contributor

@XuHuaiyu XuHuaiyu commented Mar 18, 2021 •
edited
Loading

The feature is not an experimental feature, thus we need to hide the config description.

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

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/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 18, 2021
@XuHuaiyu XuHuaiyu mentioned this pull request Mar 18, 2021
Merged
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 18, 2021
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 18, 2021
lzmhhh123
lzmhhh123 reviewed Mar 18, 2021
View reviewed changes
explain-overview.md
@@ -322,25 +321,6 @@ mysql> EXPLAIN SELECT /*+ INL_HASH_JOIN(t1, t2) */ * FROM t1, t2 WHERE t1.id = t
6 rows in set (0.00 sec)
```

#### Index Merge Join 示例
Copy link
Contributor

Choose a reason for hiding this comment

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

Also hide it in explain-subqueries.md

Copy link
Contributor

Choose a reason for hiding this comment

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

Also in optimizer-hints.md

@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 18, 2021
@ti-chi-bot
Copy link
Member

@lzmhhh123: /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.

@ti-srebot ti-srebot mentioned this pull request Mar 18, 2021
Merged
@yikeke yikeke added needs-cherry-pick-5.0 v5.0 This PR/issue applies to TiDB v5.0 labels Mar 18, 2021
@yikeke yikeke requested a review from TomShawn March 18, 2021 09:51
@TomShawn
Copy link
Contributor

/label require-LGT1
/lgtm

@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 require-LGT1 Indicates that the PR requires an LGTM. status/LGT1 Indicates that a PR has LGTM 1. labels Mar 18, 2021
@TomShawn
Copy link
Contributor

/assign Joyinqin
/size small
/translation doing

@ti-chi-bot ti-chi-bot added the size/small Changes of a small size. label Mar 18, 2021
@ti-chi-bot ti-chi-bot added translation/doing This PR’s assignee is translating this PR. and removed missing-translation-status This PR does not have translation status info. labels Mar 18, 2021
@TomShawn
Copy link
Contributor

/label require-LGT1

@TomShawn
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 8d08ebd

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

cherry pick to release-5.0 in PR #5781

@Joyinqin Joyinqin mentioned this pull request Mar 22, 2021
Merged
11 tasks
@Joyinqin
Copy link
Contributor

/translation done

@ti-chi-bot ti-chi-bot added the translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. label Mar 22, 2021
@Joyinqin
Copy link
Contributor

/remove-translation doing

@ti-chi-bot ti-chi-bot removed the translation/doing This PR’s assignee is translating this PR. label Mar 22, 2021
ti-chi-bot pushed a commit that referenced this pull request Mar 24, 2021
@ti-srebot
hide the config global-kill (#5770) (#5781)
fff4b3f
@ti-srebot ti-srebot mentioned this pull request Mar 26, 2021
Merged
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lzmhhh123 lzmhhh123 lzmhhh123 approved these changes

@TomShawn TomShawn Awaiting requested review from TomShawn

Assignees

@Joyinqin Joyinqin

Labels
require-LGT1 Indicates that the PR requires an LGTM. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. size/small Changes of a small size. 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. 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.
7 participants
@XuHuaiyu @ti-chi-bot @TomShawn @ti-srebot @Joyinqin @lzmhhh123 @yikeke