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

executor: fix the missing Grantor when querying mysql.tables_priv #38461

Merged
merged 7 commits into from
Oct 20, 2022
Merged

executor: fix the missing Grantor when querying mysql.tables_priv #38461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f5a7799
executor: fix the missing `Grantor` when querying `mysql`.`tables_priv`
CbcWestwolf Oct 13, 2022
cc40b4d
Merge branch 'fix_issue38293' of github.com:CbcWestwolf/tidb into fix…
CbcWestwolf Oct 17, 2022
9190897
Merge branch 'master' into fix_issue38293
CbcWestwolf Oct 17, 2022
a6f418e
Merge branch 'fix_issue38293' of github.com:CbcWestwolf/tidb into fix…
CbcWestwolf Oct 17, 2022
0996b2c
Merge branch 'master' into fix_issue38293
CbcWestwolf Oct 20, 2022
18307a9
Merge branch 'fix_issue38293' of github.com:CbcWestwolf/tidb into fix…
CbcWestwolf Oct 20, 2022
c19fc41
Update
CbcWestwolf Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions executor/grant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ func (e *GrantExec) Next(ctx context.Context, req *chunk.Chunk) error {
// Create internal session to start internal transaction.
isCommit := false
internalSession, err := e.getSysSession()
internalSession.GetSessionVars().User = e.ctx.GetSessionVars().User
if err != nil {
return err
}
Expand Down
13 changes: 13 additions & 0 deletions executor/grant_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,3 +588,16 @@ func TestIssue34610(t *testing.T) {
tk.MustExec("GRANT SELECT ON T1 to user_1@localhost;")
tk.MustExec("GRANT SELECT ON t1 to user_1@localhost;")
}

func TestIssue38293(t *testing.T) {
store := testkit.CreateMockStore(t)
tk := testkit.NewTestKit(t, store)
tk.Session().GetSessionVars().User = &auth.UserIdentity{Username: "root", Hostname: "localhost"}
tk.MustExec("DROP USER IF EXISTS test")
tk.MustExec("CREATE USER test")
defer func() {
tk.MustExec("DROP USER test")
}()
tk.MustExec("GRANT SELECT ON `mysql`.`db` TO test")
tk.MustQuery("SELECT `Grantor` FROM `mysql`.`tables_priv` WHERE User = 'test'").Check(testkit.Rows("root@localhost"))
}