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

executor: make the format of user and host fields ... (#18162) #18379

Merged
merged 4 commits into from
Sep 2, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #18162 to release-4.0


What problem does this PR solve?

Issue Number: related to #17846

Problem Summary: make the format of user and host fields in slow logs be compatible with MySQL

What is changed and how it works?

The format of TiDB now is: # User: {user_name}@{host_address}
For example: # User: root@127.0.0.1

After this PR, it will be: # User@Host: {user_name}[{user_name}] @ {host_name} [{host_address}], which is compatible with MySQL.
For example: # User@Host: root[root] @ localhost [127.0.0.1]

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:

Check List

Tests

  • Unit test

Release note

  • executor: make the format of user and host fields in slow logs be compatible with MySQL

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@@ -76,7 +77,11 @@ select * from t;`
}
recordString += str
}
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

Please resolve this conflict.

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.

@qw4990 please resolve the conflicts and fix CI.

@qw4990
Copy link
Contributor

qw4990 commented Sep 2, 2020

PTAL @zz-jason @SunRunAway

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

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 2, 2020
@zz-jason
Copy link
Member

zz-jason commented Sep 2, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 2, 2020
@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 18796
  • 19101
  • 18974
  • 18724
  • 19664

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@zz-jason
Copy link
Member

zz-jason commented Sep 2, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 18724

@zz-jason zz-jason changed the title executor: make the format of user and host fields in slow logs be compatible with MySQL (#18162) executor: make the format of user and host fields ... (#18162) Sep 2, 2020
@zz-jason zz-jason merged commit 1782af3 into pingcap:release-4.0 Sep 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/executor sig/execution SIG execution sig/sql-infra SIG: SQL Infra status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/4.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants