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

session,parser: make MAX_EXECUTION_TIME sql hint and global variable work #10999

Merged
merged 2 commits into from
Jul 1, 2019
Merged

session,parser: make MAX_EXECUTION_TIME sql hint and global variable work #10999

merged 2 commits into from
Jul 1, 2019

Conversation

tiancaiamao
Copy link
Contributor

Cherry-pick #10963
Tiny update to fix CI

@tiancaiamao tiancaiamao added type/2.1 cherry-pick type/bugfix This PR fixes a bug. priority/release-blocker This issue blocks a release. Please solve it ASAP. labels Jul 1, 2019
@tiancaiamao
Copy link
Contributor Author

/run-all-tests tidb-test=release-2.1 tikv=release-2.1 pd=release-2.1

@tiancaiamao
Copy link
Contributor Author

PTAL @lysu @jackysp

@tiancaiamao
Copy link
Contributor Author

/run-all-tests tidb-test=release-2.1 tikv=release-2.1 pd=release-2.1

jackysp
jackysp previously approved these changes Jul 1, 2019
View reviewed changes
Copy link
Member

@jackysp jackysp left a comment

Choose a reason for hiding this comment

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

LGTM

@jackysp jackysp dismissed their stale review July 1, 2019 07:34

need another lgtm

lysu
lysu approved these changes Jul 1, 2019
View reviewed changes
Copy link
Contributor

@lysu lysu left a comment

Choose a reason for hiding this comment

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

LGTM

@lysu lysu added the status/LGT2 Indicates that a PR has LGTM 2. label Jul 1, 2019
@ngaut ngaut merged commit db151cc into pingcap:release-2.1 Jul 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lysu lysu lysu approved these changes

@jackysp jackysp jackysp left review comments

Assignees
No one assigned
Labels
priority/release-blocker This issue blocks a release. Please solve it ASAP. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tiancaiamao @lysu @jackysp @ngaut