-
Notifications
You must be signed in to change notification settings - Fork 5.9k
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
expensivequery: fix the issue that max_exec_time hint doesn't work if it exceeds the expensive-threshold (#17359) #17534
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: sre-bot <sre-bot@pingcap.com>
/run-all-tests |
sre-bot
added
sig/execution
SIG execution
contribution
This PR is from a community contributor.
type/3.0-cherry-pick
type/bugfix
This PR fixes a bug.
labels
May 29, 2020
qw4990
added
the
priority/release-blocker
This issue blocks a release. Please solve it ASAP.
label
Jun 1, 2020
qw4990
reviewed
Jun 1, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
XuHuaiyu
approved these changes
Jun 1, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
/run-all-tests |
/merge |
sre-bot
added
the
status/can-merge
Indicates a PR has been approved by a committer.
label
Jun 1, 2020
/run-all-tests |
@sre-bot merge failed. |
/run-mybatis-test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
contribution
This PR is from a community contributor.
priority/release-blocker
This issue blocks a release. Please solve it ASAP.
sig/execution
SIG execution
status/can-merge
Indicates a PR has been approved by a committer.
type/bugfix
This PR fixes a bug.
type/3.0-cherry-pick
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
cherry-pick #17359 to release-3.0
What problem does this PR solve?
Issue Number: close #17355, #17393
Problem Summary:
1. Minimal reproduce step (Required)
set @@max_execution_time=60000;
select sleep(70);
2. What did you expect to see? (Required)
mysql> select sleep(70);
+-----------+
| sleep(70) |
+-----------+
| 1 |
+-----------+
1 row in set (1 min )
3. What did you see instead (Required)
What is changed and how it works?
What's Changed:
repair max_execution_time sometimes fails.
How it Works:
The MaxExecutionTime and ExceedExpensiveTimeThresh check logic separately.
Related changes
cherry-pick: V3.0,V3.1,V4.0
Check List
Tests
Release note