*: fix revoke statement for CURRENT_USER() and refine error message #24052

tiancaiamao · 2021-04-15T09:33:19Z

What problem does this PR solve?

Issue Number: close #23850 (Need to verify: The expected result is wrong?)

mysql> SHOW GRANTS;
+-----------------------------------------------------------+
| Grants for User                                           |
+-----------------------------------------------------------+
| GRANT ALL PRIVILEGES ON *.* TO 'u4'@'%' WITH GRANT OPTION |
+-----------------------------------------------------------+
1 row in set (0.00 sec)

mysql> REVOKE ALL ON *.* FROM CURRENT_USER();
ERROR 1105 (HY000): Unknown user: @

Problem Summary:

The user name and host part for REVOKE ... FROM CURRENT_USER is missing.

What is changed and how it works?

What's Changed:

Fill the user name and host part for CURRENT_USER.

How it Works:

Fix bug.

Related changes

Need to cherry-pick to the release branch

Check List

Tests

Unit test

Release note

Fix 'REVOKE ... FROM CURRENT_USER()' statement. The host and username is not set for CURRENT_USER and that cause the statement fail.

bb7133 · 2021-04-15T16:28:14Z

privilege/privileges/privileges_test.go

@@ -842,6 +842,12 @@ func (s *testPrivilegeSuite) TestRevokePrivileges(c *C) {
 	c.Assert(se.Auth(&auth.UserIdentity{Username: "hasgrant", Hostname: "localhost", AuthUsername: "hasgrant", AuthHostname: "%"}, nil, nil), IsTrue)
 	mustExec(c, se, "REVOKE SELECT ON mysql.* FROM 'withoutgrant'")
 	mustExec(c, se, "REVOKE ALL ON mysql.* FROM withoutgrant")
+
+	// For issue https://github.com/pingcap/tidb/issues/23850
+	mustExec(c, se, "CREATE USER u4")


Could you add test cases for u1, u2, u3 as shown in #23850?

morgo · 2021-04-15T17:36:07Z

/LGTM

morgo · 2021-04-16T00:11:55Z

Issue Number: close #23850 (Need to verify: The expected result is wrong?)

I commented in the issue, but I got this out of the MTR tests for 8.0. I think it's fine to stay with 5.7 for now and fix it when we move to MySQL 8.0 compatibility. The current behavior is not neccessarily wrong.

I have another PR which fixes some other revoke bugs: #23946 - the error messages are not technically MySQL compatible. I think we can create an issue after these merge and leave it for new contributors.

ti-chi-bot · 2021-04-28T03:05:12Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

morgo
xhebox

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.

xhebox · 2021-04-28T03:06:41Z

/merge

Rustin170506 · 2021-04-29T06:24:24Z

@xhebox consistent failures. Could you please cancel the merge?

xhebox · 2021-04-29T06:25:55Z

/merge cancel

xhebox · 2021-04-29T06:31:37Z

/hold
Error message is changed, but tests are not updated, Working on it.

xhebox · 2021-04-29T07:11:04Z

/run-common-test tidb-test=pr/1186

xhebox · 2021-04-29T07:11:25Z

/run-integration-common-test tidb-test=pr/1186

morgo · 2021-05-11T03:32:36Z

/LGTM

tiancaiamao · 2021-05-11T23:53:35Z

/merge

ti-chi-bot · 2021-05-11T23:53:40Z

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

Commit hash: 830b6d6

ti-chi-bot · 2021-05-11T23:53:50Z

@tiancaiamao: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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.

tiancaiamao · 2021-05-12T00:02:02Z

/run-integration-common-test

tiancaiamao · 2021-05-12T00:13:01Z

Why the CI is still using the old mysql-test branch?

tiancaiamao · 2021-05-12T00:13:13Z

/merge

ti-chi-bot · 2021-05-12T01:36:47Z

/run-all-tests

This bot automatically retries jobs that failed on can merge PRs (send feedback to hi-rustin).

Silence the bot with the /merge cancel comment for consistent failures.

ti-chi-bot · 2021-05-12T03:09:46Z

/run-all-tests

This bot automatically retries jobs that failed on can merge PRs (send feedback to hi-rustin).

Silence the bot with the /merge cancel comment for consistent failures.

tiancaiamao · 2021-05-12T03:26:28Z

/run-tics-test

ti-chi-bot · 2021-05-12T04:42:47Z

/run-all-tests

This bot automatically retries jobs that failed on can merge PRs (send feedback to hi-rustin).

Silence the bot with the /merge cancel comment for consistent failures.

tiancaiamao · 2021-05-12T06:05:56Z

/run-tics-test

zhouqiang-cl · 2021-05-12T06:43:48Z

/run-tics-test

zhouqiang-cl · 2021-05-12T07:00:26Z

/run-tics-test

…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)

*: fix revoke statement for CURRENT_USER() and refine error message

38e8549

tiancaiamao requested review from a team as code owners April 15, 2021 09:33

tiancaiamao requested review from qw4990, hanfei1991 and morgo and removed request for a team April 15, 2021 09:33

ti-chi-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 15, 2021

tiancaiamao requested a review from zimulala April 15, 2021 09:33

tiancaiamao added component/privilege sig/sql-infra SIG: SQL Infra labels Apr 15, 2021

tiancaiamao removed request for qw4990 and hanfei1991 April 15, 2021 09:33

github-actions bot added the sig/execution SIG execution label Apr 15, 2021

fix errdoc check

4a963b2

bb7133 reviewed Apr 15, 2021

View reviewed changes

fix CI and go mod tidy

ef17dd2

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

fix CI?

2eeb5ec

ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 15, 2021

xhebox approved these changes Apr 28, 2021

View reviewed changes

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 Apr 28, 2021

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

ti-chi-bot added 2 commits April 29, 2021 14:00

Merge branch 'master' into privilege

772180e

Merge branch 'master' into privilege

830b6d6

ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Apr 29, 2021

ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 29, 2021

tiancaiamao removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 11, 2021

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

Merge branch 'master' into privilege

840f66e

longfangsong mentioned this pull request May 12, 2021

txn: Add txn state's view #22908

Merged

zhouqiang-cl merged commit e40f8c0 into pingcap:master May 12, 2021

tiancaiamao deleted the privilege branch May 12, 2021 08:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

*: fix revoke statement for CURRENT_USER() and refine error message #24052

*: fix revoke statement for CURRENT_USER() and refine error message #24052

tiancaiamao commented Apr 15, 2021

bb7133 Apr 15, 2021

morgo commented Apr 15, 2021

morgo commented Apr 16, 2021

ti-chi-bot commented Apr 28, 2021

xhebox commented Apr 28, 2021

Rustin170506 commented Apr 29, 2021

xhebox commented Apr 29, 2021

xhebox commented Apr 29, 2021

xhebox commented Apr 29, 2021

xhebox commented Apr 29, 2021

morgo commented May 11, 2021

tiancaiamao commented May 11, 2021

ti-chi-bot commented May 11, 2021

ti-chi-bot commented May 11, 2021

tiancaiamao commented May 12, 2021

tiancaiamao commented May 12, 2021

tiancaiamao commented May 12, 2021

ti-chi-bot commented May 12, 2021

ti-chi-bot commented May 12, 2021

tiancaiamao commented May 12, 2021

ti-chi-bot commented May 12, 2021

tiancaiamao commented May 12, 2021

zhouqiang-cl commented May 12, 2021

zhouqiang-cl commented May 12, 2021

*: fix revoke statement for CURRENT_USER() and refine error message #24052

*: fix revoke statement for CURRENT_USER() and refine error message #24052

Conversation

tiancaiamao commented Apr 15, 2021

What problem does this PR solve?

What is changed and how it works?

Related changes

Check List

Release note

bb7133 Apr 15, 2021

Choose a reason for hiding this comment

morgo commented Apr 15, 2021

morgo commented Apr 16, 2021

ti-chi-bot commented Apr 28, 2021

xhebox commented Apr 28, 2021

Rustin170506 commented Apr 29, 2021

xhebox commented Apr 29, 2021

xhebox commented Apr 29, 2021

xhebox commented Apr 29, 2021

xhebox commented Apr 29, 2021

morgo commented May 11, 2021

tiancaiamao commented May 11, 2021

ti-chi-bot commented May 11, 2021

ti-chi-bot commented May 11, 2021

tiancaiamao commented May 12, 2021

tiancaiamao commented May 12, 2021

tiancaiamao commented May 12, 2021

ti-chi-bot commented May 12, 2021

ti-chi-bot commented May 12, 2021

tiancaiamao commented May 12, 2021

ti-chi-bot commented May 12, 2021

tiancaiamao commented May 12, 2021

zhouqiang-cl commented May 12, 2021

zhouqiang-cl commented May 12, 2021