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

bootstrap: add mysql.user columns for parser#1121 #21856

Merged
merged 8 commits into from
Dec 21, 2020
Merged

bootstrap: add mysql.user columns for parser#1121 #21856

merged 8 commits into from
Dec 21, 2020

Conversation

lance6716
Copy link
Contributor

@lance6716 lance6716 commented Dec 17, 2020 •
edited
Loading

What problem does this PR solve?

Problem Summary: pingcap/parser#1121 added Repl_client_priv and Repl_slave_priv to support parsing REPLICATION CLIENT, REPLICATION SLAVE. In order make TiDB compatible with parser, I added those two columns to mysql.user

needed for pingcap/dm#1320

What is changed and how it works?

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests

  • pass original tests

Side effects

Release note

  • No release note

@lance6716 lance6716 mentioned this pull request Dec 17, 2020
Merged
@lance6716
Copy link
Contributor Author

/run-all-tests -parser=pr/1121

@lance6716
Copy link
Contributor Author

PTAL @wjhuang2016 @leoppro

@lance6716
Copy link
Contributor Author

ping @wjhuang2016 @leoppro

wjhuang2016
wjhuang2016 reviewed Dec 21, 2020
View reviewed changes
session/bootstrap.go Outdated
@@ -64,6 +64,8 @@ const (
Create_tmp_table_priv ENUM('N','Y') NOT NULL DEFAULT 'N',
Lock_tables_priv ENUM('N','Y') NOT NULL DEFAULT 'N',
Execute_priv ENUM('N','Y') NOT NULL DEFAULT 'N',
Repl_slave_priv ENUM('N','Y') NOT NULL DEFAULT 'N',
Repl_client_priv ENUM('N','Y') NOT NULL DEFAULT 'N',
Copy link
Member

Choose a reason for hiding this comment

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

The column should be added to the end of the columns.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done in b6e1a91

@lance6716
Copy link
Contributor Author

/run-all-tests

zier-one
zier-one reviewed Dec 21, 2020
View reviewed changes
Copy link
Contributor

@zier-one zier-one 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 Dec 21, 2020
wjhuang2016
wjhuang2016 reviewed Dec 21, 2020
View reviewed changes
Copy link
Member

@wjhuang2016 wjhuang2016 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 removed the status/LGT1 Indicates that a PR has LGTM 1. label Dec 21, 2020
@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Dec 21, 2020
@lance6716
Copy link
Contributor Author

/merge

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

/run-all-tests

@lance6716
Copy link
Contributor Author 

[2020-12-21T06:51:23.000Z] + docker build -t hub.pingcap.net/qa/tidb:master -f Dockerfile .
[2020-12-21T06:51:24.890Z] Sending build context to Docker daemon  364.6MB
[2020-12-21T06:51:24.890Z] Step 1/7 : FROM pingcap/alpine-glibc
[2020-12-21T06:51:28.162Z] toomanyrequests: You have reached your pull rate limit. You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limit

@ti-srebot
Copy link
Contributor

@lance6716 merge failed.

@lance6716
Copy link
Contributor Author

/merge

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@lance6716 merge failed.

@lance6716
Copy link
Contributor Author

/merge

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit e573ed6 into pingcap:master Dec 21, 2020
lance6716 added a commit to lance6716/tidb that referenced this pull request Dec 24, 2020
@lance6716
session: fix didn't change current version in pingcap#21856
7746fe9
@lance6716 lance6716 mentioned this pull request Dec 24, 2020
Merged
ti-srebot pushed a commit that referenced this pull request Dec 25, 2020
@lance6716
session: fix didn't change current version in #21856 (#22011)
4fdc99b
@lance6716
Copy link
Contributor Author

/label needs-cherry-pick-5.0-rc

@lance6716
Copy link
Contributor Author

/run-cherry-picker

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Dec 30, 2020
@lance6716 @ti-srebot
cherry pick pingcap#21856 to release-5.0-rc
a6bc211 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Dec 30, 2020
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0-rc in PR #22112

@ti-srebot ti-srebot mentioned this pull request Dec 30, 2020
Closed
XuHuaiyu pushed a commit that referenced this pull request Dec 30, 2020
@ti-srebot @lance6716
bootstrap: add mysql.user columns for parser#1121 (#21856) (#22112)
496f969 
Co-authored-by: lance6716 <lance6716@gmail.com>
@tiancaiamao tiancaiamao mentioned this pull request Mar 18, 2021
Merged
@ti-srebot ti-srebot mentioned this pull request Mar 25, 2021
Merged
@Defined2014 Defined2014 mentioned this pull request Apr 1, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wjhuang2016 wjhuang2016 wjhuang2016 left review comments

@zier-one zier-one zier-one left review comments

@ti-srebot ti-srebot ti-srebot approved these changes

Assignees
No one assigned
Labels
status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@lance6716 @ti-srebot @wjhuang2016 @zier-one