server: redact some error code, part(2/3) #20591
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SunRunAway
reviewed
Nov 27, 2020
cfzjywxk
force-pushed
the
err_msg_shadow
branch
from
b7353b8
to
b7d3b77
Compare
SunRunAway
changed the title
SunRunAway
requested review from
bb7133
and removed request for
lysu and
jackysp
SunRunAway
reviewed
Dec 18, 2020
errno/errname.go
Outdated
| @@ -527,8 +527,8 @@ var MySQLErrName = map[uint16]*mysql.ErrMessage{ | |||
| ErrPartState: mysql.Message("Partition state cannot be defined from CREATE/ALTER TABLE", nil), | |||
| ErrLimitedPartRange: mysql.Message("The %-.64s handler only supports 32 bit integers in VALUES", nil), | |||
| ErrPluginIsNotLoaded: mysql.Message("Plugin '%-.192s' is not loaded", nil), | |||
| ErrWrongValue: mysql.Message("Incorrect %-.32s value: '%-.128s'", nil), | |||
| ErrNoPartitionForGivenValue: mysql.Message("Table has no partition for value %-.64s", nil), | |||
| ErrWrongValue: mysql.Message("Incorrect %-.32s value: '%-.128s'", []int{0, 1}), | |||
There was a problem hiding this comment.
The first argument is the Type and should not be redacted, am I right?
errno/errname.go
Outdated
| @@ -670,9 +670,9 @@ var MySQLErrName = map[uint16]*mysql.ErrMessage{ | |||
| ErrInsideTransactionPreventsSwitchBinlogDirect: mysql.Message("Cannot modify @@session.binlogDirectNonTransactionalUpdates inside a transaction", nil), | |||
| ErrStoredFunctionPreventsSwitchBinlogDirect: mysql.Message("Cannot change the binlog direct flag inside a stored function or trigger", nil), | |||
| ErrSpatialMustHaveGeomCol: mysql.Message("A SPATIAL index may only contain a geometrical type column", nil), | |||
| ErrTooLongIndexComment: mysql.Message("Comment for index '%-.64s' is too long (max = %d)", nil), | |||
| ErrTooLongIndexComment: mysql.Message("Comment for index '%-.64s' is too long (max = %d)", []int{0}), | |||
There was a problem hiding this comment.
The index name is not necessary to be redacted
errno/errname.go
Outdated
| ErrLockAborted: mysql.Message("Wait on a lock was aborted due to a pending exclusive lock", nil), | ||
| ErrDataOutOfRange: mysql.Message("%s value is out of range in '%s'", nil), | ||
| ErrDataOutOfRange: mysql.Message("%s value is out of range in '%s'", []int{0, 1}), |
There was a problem hiding this comment.
The first argument is the Type and should not be redacted.
cfzjywxk
force-pushed
the
err_msg_shadow
branch
from
b7d3b77
to
3838341
Compare
|
LGTM |
ti-srebot
approved these changes
Dec 18, 2020
|
/merge |
ti-srebot
added
the
status/can-merge
bb7133
approved these changes
Dec 18, 2020
|
/run-all-tests |
ti-srebot
pushed a commit
to ti-srebot/tidb
that referenced
this pull request
Dec 20, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
|
cherry pick to release-4.0 in PR #21891 |
ti-srebot
added a commit
that referenced
this pull request
Jan 26, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
Issue Number:
Problem Summary:
Part(2/3) of #18566 error message log redact, from
ErrLogInUsetoErrSkippingLoggedTransaction.What is changed and how it works?
What's Changed:
Add some redact parameters for these error messages.
How it Works:
Related changes
Check List
Tests
Side effects
Release note