execution: Fix issue 24439 Inconsistent error with MySQL for GRANT CREATE USER ON <specific db>.* #24485

sylzd · 2021-05-08T07:49:08Z

What problem does this PR solve?

Issue Number: close #24439

Problem Summary: fix all error info about global privilege on DB GRANT.

What is changed and how it works?

Proposal: xxx

What's Changed:
grant.go

How it Works:

judge scope before do DB GRANT

Related changes

none

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)
No code

Side effects

Performance regression
- Consumes more CPU
- Consumes more MEM
Breaking backward compatibility

Release note

fix error info to promote compatipatibility of mysql.

…db>.*

ti-srebot · 2021-05-08T07:49:39Z

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

ti-srebot · 2021-05-08T07:56:37Z

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

bb7133 · 2021-05-08T08:27:10Z

Thanks for your contribution!

Please add some test cases for your change.

sylzd · 2021-05-08T11:00:47Z

@bb7133 @wshwsh12 PTAL

wshwsh12 · 2021-05-10T07:11:41Z

executor/grant.go

@@ -473,6 +473,13 @@ func (e *GrantExec) grantDBLevel(priv *ast.PrivElem, user *ast.UserSpec, interna
 	if priv.Priv == mysql.UsagePriv {
 		return nil
 	}
+	globalOnlyPrivs := mysql.Privileges{mysql.ProcessPriv, mysql.ShowDBPriv, mysql.SuperPriv, mysql.CreateUserPriv, mysql.CreateTablespacePriv, mysql.ShutdownPriv, mysql.ReloadPriv, mysql.FilePriv, mysql.ReplicationClientPriv, mysql.ReplicationSlavePriv}


Could we unexplicit define globalOnlyPrivs? Use AllGlobalPrivs and AllDBPrivs to get the result?

I had tried AllGlobalPrivs and AllDBPrivs，but it's not match. globalOnlyPrivs whitelist comes from mysql document and my test, i thinks it is more safe.

Can we add this to the parser package here: https://github.com/pingcap/parser/blob/cd9cd78e230c8bf9c1de6a8864bd1e905904312c/mysql/privs.go#L296-L306

I don't think that any new "global only" privs will be added, since this overlaps with Dynamic privileges.

For TiDB there is also the ConfigPriv which should be in this list.

What should I do to add two codes into different repos at the same time? I create a pr to parser: parser: Fix tidb issue 24439 Inconsistent error with MySQL for GRANT CREATE USER ON <specific db>.* parser#1224

Dynamic privileges in my opinion: "can only be global scoped" with many other special privs rather than "global scoped privileges are all dynamic privileges". And it's the other grant method used by table "mysql.global_grants" not "mysql.user", which is not conflict with globalOnlyPrivs (or maybe means "StaticGlobalOnlyPrivs"?)

yes, it is. I will fix it now.

wshwsh12 · 2021-05-10T07:35:29Z

/lgtm

sylzd

add ConfigPriv

sylzd · 2021-05-11T04:16:16Z

executor/grant.go

@@ -473,6 +473,13 @@ func (e *GrantExec) grantDBLevel(priv *ast.PrivElem, user *ast.UserSpec, interna
 	if priv.Priv == mysql.UsagePriv {
 		return nil
 	}
+	globalOnlyPrivs := mysql.Privileges{mysql.ProcessPriv, mysql.ShowDBPriv, mysql.SuperPriv, mysql.CreateUserPriv, mysql.CreateTablespacePriv, mysql.ShutdownPriv, mysql.ReloadPriv, mysql.FilePriv, mysql.ReplicationClientPriv, mysql.ReplicationSlavePriv}


What should I do to add two codes into different repos at the same time? I create a pr to parser: parser: Fix tidb issue 24439 Inconsistent error with MySQL for GRANT CREATE USER ON <specific db>.* parser#1224

Dynamic privileges in my opinion: "can only be global scoped" with many other special privs rather than "global scoped privileges are all dynamic privileges". And it's the other grant method used by table "mysql.global_grants" not "mysql.user", which is not conflict with globalOnlyPrivs (or maybe means "StaticGlobalOnlyPrivs"?)

yes, it is. I will fix it now.

morgo · 2021-05-12T13:42:16Z

Thanks for creating the parser PR! Let's get it to merge, and then you can update this PR to reference mysql.StaticGlobalOnlyPrivs.

For my comment on (2), I had just meant that because there is a new feature (Dynamic privileges) the list of StaticGlobalOnlyPrivs is actually likely to stay unchanged in future. This is because any new global-only will naturally be a dynamic privilege instead. It is not related to this work, just an observation that the list will be static.

morgo · 2021-05-13T03:04:20Z

/LGTM

ti-chi-bot · 2021-05-13T03:04:23Z

@morgo: /lgtm is only allowed for the reviewers in list.

In response to this:

/LGTM

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

morgo · 2021-05-13T03:04:54Z

/LGTM

ti-chi-bot · 2021-05-13T03:04:57Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

morgo
wshwsh12

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

morgo · 2021-05-13T03:05:04Z

/merge

ti-chi-bot · 2021-05-13T03:05:08Z

This pull request has been accepted and is ready to merge.

Commit hash: 3a10e3c

…ingcap#24052) * *: fix revoke statement for CURRENT_USER() and refine error message planner: support set tidb_allow_mpp to `2` or `ENFORCE` to enforce use mpp mode. (pingcap#24516) store/tikv: remove use of SchemaAmender option in store/tikv (pingcap#24408) *: the value of tikv-client.store-liveness-timeout should not less than 0 (pingcap#24244) store/tikv: remove use of EnableAsyncCommit option in store/tikv (pingcap#24462) txn: Add txn state's view (pingcap#22908) planner: ignore lock for temporary table of PointGet and BatchPointGet (pingcap#24540) store/tikv: remove use of ReplicaRead transaction option in store/tikv (pingcap#24409) store/driver: move error to single package (pingcap#24549) ddl: add check table compatibility for temporary table (pingcap#24501) store/tikv: remove use of IsStatenessReadOnly option in store/tikv (pingcap#24464) store/tikv: change backoff type for missed tiflash peer. (pingcap#24577) store/tikv: remove use of MatchStoreLabels transaction option in store/tikv (pingcap#24465) executor, meta: Allocate auto id for global temporary tables (pingcap#24506) store/tikv: remove use of SampleStep option in store/tikv (pingcap#24461) executor: add partition pruning tests for adding and dropping partition operations (pingcap#24573) ddl: forbid partition on temporary mode before put into queue (pingcap#24565) ddl: speedup test case TestIndexOnMultipleGeneratedColumn (pingcap#24487) execution: Fix issue 24439 Inconsistent error with MySQL for GRANT CREATE USER ON <specific db>.* (pingcap#24485) *: fix errcheck (pingcap#24463) test: make TestExtractStartTs stable (pingcap#24585) ddl: forbid recover/flashback temporary tables (pingcap#24518) executor: fix point_get result on clustered index when new-row-format disabled but new-collation enabled (pingcap#24544) executor: Improve the performance of appending not fixed columns (pingcap#20969) *: typo fix (pingcap#24564) planner/core: refresh stale regions in cache for batch cop response (pingcap#24457) binlog: DML on temporary tables do not write binlog (pingcap#24570) store/tikv: remove use of GuaranteeLinearizability option in store/tikv (pingcap#24605) store/tikv: remove use of CollectRuntimeStats option in store/tikv (pingcap#24604) store/tikv: move Backoffer into a single package (pingcap#24525) variables: init cte max recursive deeps in a new session (pingcap#24609) store/tikv: move transaction options out to /kv (pingcap#24619) store/driver: move backoff driver into single package so we can use i… (pingcap#24624) server: close the temporary session in HTTP API to avoid memory leak (pingcap#24339) store/tikv: use latest PD TS plus one as min commit ts (pingcap#24579) planner: fix incorrect TableDual plan built from nulleq (pingcap#24596) ranger: fix the case which could have duplicate ranges (pingcap#24590) executor, store: Pass the SQL digest down to pessimistic lock request (pingcap#24380) kv: remove UnionStore interface (pingcap#24625) *: enable gosimple linter (pingcap#24617) txn: avoid the gc resolving pessimistic locks of ongoing transactions (pingcap#24601) util: fix wrong enum building for index range (pingcap#24632) sessionctx: change innodb large prefix default (pingcap#24555) store: fix data race about KVStore.tikvClient (pingcap#24655) executor, privileges: Add dynamic privileges to SHOW PRIVILEGES (pingcap#24646) ddl: refactor rule [4/6] (pingcap#24007) cmd: ddl_test modify retryCnt from 5 to 20 (pingcap#24662) executor: add correctness tests about direct reading with ORDER BY and LIMIT (pingcap#24455) store/tikv: remove options from unionstore (pingcap#24629) planner: fix wrongly check for update statement (pingcap#24614) store/tikv: remove CompareTS (pingcap#24657) planner, privilege: Add security enhanced mode part 4 (pingcap#24416) executor: add some test cases about partition table dynamic-mode with split-region (pingcap#24665) planner: fix wrong column offsets when processing dynamic pruning for IndexJoin (pingcap#24659) *: Add security enhanced mode part 3 (pingcap#24412) store/tikv: resolve ReplicaReadType dependencies (pingcap#24653) executor: add test cases about partition table with `expression` (pingcap#24628) tablecodec: fix write wrong prefix index value when collation is ascii_bin/latin1_bin (pingcap#24578) *: compatibility with staleread (pingcap#24285) session: test that temporary tables will also be retried (pingcap#24505) domain, session: Add new sysvarcache to replace global values cache (pingcap#24359) ddl, transaction: DDL on temporary tables won't affect transactions (pingcap#24534) *: implement tidb_bounded_staleness built-in function (pingcap#24328) executor: add correctness tests for partition table with different joins (pingcap#24673) expression: fix the spelling of word arithmetical (pingcap#24713) store/copr: balance region for batch cop task (pingcap#24521) store, metrics: Add metrics for safetTS updating (pingcap#24687) sem: add tidbredact log to restricted variables (pingcap#24701) session: fix dml_batch_size doesn't load the global variable (pingcap#24710) store/tikv: retry TSO RPC (pingcap#24682) expression, planner: push cast down to control function with enum type. (pingcap#24542) executor: add correctness tests about IndexMerge (pingcap#24674) variable: change default for DefDMLBatchSize tidbOptInt64 call (pingcap#24697) planner: add partitioning pruning tests for range partitioning (pingcap#24554) *: add option for enum push down (pingcap#24685) txn: break dependency from store/tikv to tidb/kv cause by TransactionOption (pingcap#24656) executor: enhancement for ListInDisk(support writing after reading) (pingcap#24379) kv: move TxnScope into kv (pingcap#24715) execution: fix the incorrect use of cached plan for point get (pingcap#24749) executor: add correctness tests about direct reading with indexJoin (pingcap#24497) variable: fix sysvar datarace with deep copy (pingcap#24732) *: Implementing RENAME USER (pingcap#24413) infoschema, executor: Add the deadlock table (pingcap#24524) docs: Some proposal for renaming and configurations for Lock View (pingcap#24718) planner: add range partition boundaries tests with BETWEEN expression (pingcap#24598) oracle: simplify timestamp utilities (pingcap#24688) executor: fix wrong enum key in point get (pingcap#24618) ranger: fix incorrect enum range for xxx_ci collation (pingcap#24661) executor: add some test cases about dynamic-mode and apply operator (pingcap#24683) store/tikv: remove Variables.Hook (pingcap#24758) ddl: speed up the execution time of `TestBackwardCompatibility`. (pingcap#24704) *: prepare errors for CTE (pingcap#24763) expression: support cast real/int as real (pingcap#24670) executor: add table name in log (pingcap#24666) expression: add builtin function ``json_pretty`` (pingcap#24675) ddl: make `TestDropLastVisibleColumns` stable (pingcap#24790) * ddl: make `TestDropLastVisibleColumns` stable *: support AS OF TIMESTAMP read-only begin statement (pingcap#24740) executor: Fix unstable TestTiDBLastTxnInfoCommitMode (pingcap#24779) planner: add tests for partition range boundaries for LT/GT (pingcap#24574) test: record random seed in TestIssue20658 (pingcap#24782) store/tikv/retry: define Config instead of BackoffType (pingcap#24692) config: ignore tiflash when show config (pingcap#24770) privileges: improve dynamic privs registration and tests (pingcap#24773) README: remove the link of TiDB Monthly Update (pingcap#24791) region_cache: filter peers on tombstone or dropped stores (pingcap#24726) util/stmtsummary: remove import package tikv (pingcap#24776) ddl: grammar check for create unsupported temporary table (pingcap#24723) *: update go.etcd.io/bbolt (pingcap#24799) ddl: speed up the execution time of `ddl test` and `Test Chunk pingcap#7 ddl-other` (pingcap#24780) executor: remove the unnecessary use of fmt.Sprintf (pingcap#24815) executor: fix index join panic on prefix index on some cases (pingcap#24568)

sylzd and others added 16 commits December 8, 2020 14:57

add tcp4only for lvs

9435573

fix typo

a19f66e

Merge branch 'master' into master

66a261c

Merge branch 'master' into master

f620f14

fix annotaion

ea27051

fix

7b4631b

Merge branch 'master' into master

4187316

Merge branch 'master' into master

74b08ea

Merge branch 'master' into master

a4d0e75

Merge branch 'master' into master

aa3b66e

Merge branch 'master' into master

570c8f1

Merge branch 'master' into master

ebef90f

Merge branch 'master' of https://github.com/pingcap/tidb into pingcap

8c95fa1

Merge branch 'master' of https://github.com/pingcap/tidb into pingcap

ba5e45e

Merge branch 'master' of https://github.com/pingcap/tidb into pingcap

f011c3a

fix Inconsistent error with MySQL for GRANT CREATE USER ON <specific …

3563017

…db>.*

sylzd requested a review from a team as a code owner May 8, 2021 07:49

sylzd requested review from wshwsh12 and removed request for a team May 8, 2021 07:49

ti-chi-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 8, 2021

github-actions bot added the sig/execution SIG execution label May 8, 2021

fix import group

d17a634

sylzd changed the title Fix issue 24439: Inconsistent error with MySQL for GRANT CREATE USER ON <specific db>.* grant: Fix issue 24439 Inconsistent error with MySQL for GRANT CREATE USER ON <specific db>.* May 8, 2021

sylzd added 3 commits May 8, 2021 15:59

Merge branch 'master' into fix_24439

b8c0546

fix order of dberror import

11718cc

Merge branch 'fix_24439' of github.com:sylzd/tidb into fix_24439

8190f63

more graceful

42a475a

sylzd changed the title grant: Fix issue 24439 Inconsistent error with MySQL for GRANT CREATE USER ON <specific db>.* execution: Fix issue 24439 Inconsistent error with MySQL for GRANT CREATE USER ON <specific db>.* May 8, 2021

sylzd added 2 commits May 8, 2021 18:38

sync to errors.toml

fcacc76

Merge branch 'fix_24439' of github.com:sylzd/tidb into fix_24439

715a479

wshwsh12 reviewed May 10, 2021

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 10, 2021

wshwsh12 requested a review from bb7133 May 10, 2021 07:35

add configPriv

0795b60

sylzd mentioned this pull request May 11, 2021

parser: Fix tidb issue 24439 Inconsistent error with MySQL for GRANT CREATE USER ON <specific db>.* pingcap/parser#1224

Merged

sylzd commented May 11, 2021

View reviewed changes

move StaticGlobalOnlyPrivs to parser mode

82c8999

ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 13, 2021

Merge branch 'master' into fix_24439

052e2f9

ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 13, 2021

sylzd added 2 commits May 13, 2021 10:44

fix go.sum tidy

c98786e

Merge branch 'fix_24439' of github.com:sylzd/tidb into fix_24439

3a10e3c

morgo added the sig/sql-infra SIG: SQL Infra label May 13, 2021

ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels May 13, 2021

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 13, 2021

ti-chi-bot merged commit dc5c226 into pingcap:master May 13, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

execution: Fix issue 24439 Inconsistent error with MySQL for GRANT CREATE USER ON <specific db>.* #24485

execution: Fix issue 24439 Inconsistent error with MySQL for GRANT CREATE USER ON <specific db>.* #24485

sylzd commented May 8, 2021 •

edited

Loading

ti-srebot commented May 8, 2021

ti-srebot commented May 8, 2021

bb7133 commented May 8, 2021

sylzd commented May 8, 2021

wshwsh12 May 10, 2021

sylzd May 10, 2021 •

edited

Loading

morgo May 10, 2021

sylzd May 11, 2021

wshwsh12 commented May 10, 2021

sylzd left a comment

sylzd May 11, 2021

morgo commented May 12, 2021

morgo commented May 13, 2021

ti-chi-bot commented May 13, 2021

morgo commented May 13, 2021

ti-chi-bot commented May 13, 2021

morgo commented May 13, 2021

ti-chi-bot commented May 13, 2021

execution: Fix issue 24439 Inconsistent error with MySQL for GRANT CREATE USER ON <specific db>.* #24485

execution: Fix issue 24439 Inconsistent error with MySQL for GRANT CREATE USER ON <specific db>.* #24485

Conversation

sylzd commented May 8, 2021 • edited Loading

What problem does this PR solve?

What is changed and how it works?

Related changes

Check List

Release note

ti-srebot commented May 8, 2021

ti-srebot commented May 8, 2021

bb7133 commented May 8, 2021

sylzd commented May 8, 2021

wshwsh12 May 10, 2021

Choose a reason for hiding this comment

sylzd May 10, 2021 • edited Loading

Choose a reason for hiding this comment

morgo May 10, 2021

Choose a reason for hiding this comment

sylzd May 11, 2021

Choose a reason for hiding this comment

wshwsh12 commented May 10, 2021

sylzd left a comment

Choose a reason for hiding this comment

sylzd May 11, 2021

Choose a reason for hiding this comment

morgo commented May 12, 2021

morgo commented May 13, 2021

ti-chi-bot commented May 13, 2021

morgo commented May 13, 2021

ti-chi-bot commented May 13, 2021

morgo commented May 13, 2021

ti-chi-bot commented May 13, 2021

sylzd commented May 8, 2021 •

edited

Loading

sylzd May 10, 2021 •

edited

Loading