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.

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

*: fix 'db' and 'Info' column of 'show processlist' (#10985) #11000

Merged
merged 4 commits into from
Jul 1, 2019

Conversation

wshwsh12
Copy link
Contributor

@wshwsh12 wshwsh12 commented Jul 1, 2019

cherry-pick #10985

conflict:
session/session.go
util/expensivequery/expensivequery.go
util/processinfo.go

@wshwsh12
Copy link
Contributor Author

wshwsh12 commented Jul 1, 2019

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

Copy link
Contributor

@XuHuaiyu XuHuaiyu left a comment

Choose a reason for hiding this comment

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

LGTM

@wshwsh12 wshwsh12 added sig/execution SIG execution type/2.1 cherry-pick type/bugfix This PR fixes a bug. labels Jul 1, 2019
@wshwsh12 wshwsh12 requested a review from zz-jason July 1, 2019 07:40
Copy link
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

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

LGTM

@wshwsh12 wshwsh12 changed the title *: fix 'db' and 'Info' column of 'show processlist' #10985 *: fix 'db' and 'Info' column of 'show processlist' (#10985) Jul 1, 2019
@wshwsh12 wshwsh12 requested a review from zz-jason July 1, 2019 12:41
@zz-jason zz-jason merged commit d8defc5 into pingcap:release-2.1 Jul 1, 2019
@zz-jason zz-jason added the status/LGT2 Indicates that a PR has LGTM 2. label Jul 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sig/execution SIG execution status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants