-
Notifications
You must be signed in to change notification settings - Fork 5.8k
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) #17536
expensivequery: fix the issue that max_exec_time hint doesn't work if it exceeds the expensive-threshold (#17359) #17536
Conversation
Signed-off-by: sre-bot <sre-bot@pingcap.com>
/run-all-tests |
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.
@XuHuaiyu Please resolve the conflicts.
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
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 |
@sre-bot merge failed. |
/merge |
/merge |
/run-all-tests |
@sre-bot merge failed. |
/run-all-tests |
@sre-bot merge failed. |
/merge |
Your auto merge job has been accepted, waiting for:
|
/run-all-tests |
@sre-bot merge failed. |
@sre-bot, please update your pull request. |
/merge |
Sorry @XuHuaiyu, you don't have permission to trigger auto merge event on this branch. |
/merge |
/run-all-tests |
cherry-pick #17359 to release-4.0
What problem does this PR solve?
Issue Number: close #17355, close #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