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

*: do not start slow-log timer before parsing (#13846) #13898

Merged
merged 2 commits into from
Dec 10, 2019
Merged

*: do not start slow-log timer before parsing (#13846) #13898

merged 2 commits into from
Dec 10, 2019

Conversation

jackysp
Copy link
Member

@jackysp jackysp commented Dec 4, 2019

Conflicts:
config/config_test.go
session/session.go

What problem does this PR solve?

Cherry-pick #13846 to release 3.0.

@jackysp
*: do not start slow-log timer before parsing (pingcap#13846)
ead5841 
 Conflicts:
	config/config_test.go
	session/session.go
@jackysp jackysp added type/enhancement The issue or PR belongs to an enhancement. type/3.0 cherry-pick labels Dec 4, 2019
zimulala
zimulala reviewed Dec 6, 2019
View reviewed changes
Copy link
Contributor

@zimulala zimulala 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
Copy link
Member Author

jackysp commented Dec 9, 2019

PTAL @crazycs520 @lysu @imtbkcat

lysu
lysu approved these changes Dec 10, 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

@jackysp
Copy link
Member Author

jackysp commented Dec 10, 2019

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 10, 2019
@sre-bot
Copy link
Contributor

sre-bot commented Dec 10, 2019

/run-all-tests

@sre-bot sre-bot merged commit 9da133f into pingcap:release-3.0 Dec 10, 2019
@jackysp jackysp deleted the multi-query-3.0 branch February 27, 2020 13:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zimulala zimulala zimulala left review comments

@lysu lysu lysu approved these changes

@crazycs520 crazycs520 Awaiting requested review from crazycs520

Assignees
No one assigned
Labels
status/can-merge Indicates a PR has been approved by a committer. type/enhancement The issue or PR belongs to an enhancement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jackysp @sre-bot @lysu @zimulala