Skip to content

Commit e4c846f

Browse files
committed
errno: move user prefix error to bottom
1 parent bcbb47a commit e4c846f

3 files changed

Lines changed: 7 additions & 8 deletions

File tree

errors.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3106,11 +3106,6 @@ error = '''
31063106
You must reset your password using ALTER USER statement before executing this statement
31073107
'''
31083108

3109-
["server:20003"]
3110-
error = '''
3111-
User name prefix does not match the assigned keyspace.
3112-
'''
3113-
31143109
["server:3159"]
31153110
error = '''
31163111
Connections using insecure transport are prohibited while --require_secure_transport=ON.
@@ -3136,6 +3131,11 @@ error = '''
31363131
client has multi-statement capability disabled. Run SET GLOBAL tidb_multi_statement_mode='ON' after you understand the security risk
31373132
'''
31383133

3134+
["server:20003"]
3135+
error = '''
3136+
User name prefix does not match the assigned keyspace.
3137+
'''
3138+
31393139
["session:8002"]
31403140
error = '''
31413141
[%d] can not retry select for update statement
@@ -3620,4 +3620,3 @@ snapshot is older than GC safe point %s
36203620
error = '''
36213621
option '%s' is no longer supported. Reason: %s
36223622
'''
3623-

pkg/errno/errcode.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,6 @@ const (
861861
ErrBadUser = 3162
862862
ErrUserAlreadyExists = 3163
863863
ErrInvalidJSONPathArrayCell = 3165
864-
ErrUserPrefixMismatch = 20003
865864
ErrInvalidEncryptionOption = 3184
866865
ErrTooLongValueForType = 3505
867866
ErrPKIndexCantBeInvisible = 3522
@@ -1191,4 +1190,5 @@ const (
11911190
ErrTiFlashServerTimeout = 9012
11921191
ErrTiFlashServerBusy = 9013
11931192
ErrTiFlashBackfillIndex = 9014
1193+
ErrUserPrefixMismatch = 20003
11941194
)

pkg/errno/errname.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,6 @@ var MySQLErrName = map[uint16]*mysql.ErrMessage{
864864
ErrBadUser: mysql.Message("User %s does not exist.", nil),
865865
ErrUserAlreadyExists: mysql.Message("User %s already exists.", nil),
866866
ErrInvalidJSONPathArrayCell: mysql.Message("A path expression is not a path to a cell in an array.", nil),
867-
ErrUserPrefixMismatch: mysql.Message("User name prefix does not match the assigned keyspace.", nil),
868867
ErrInvalidEncryptionOption: mysql.Message("Invalid encryption option.", nil),
869868
ErrTooLongValueForType: mysql.Message("Too long enumeration/set value for column %s.", nil),
870869
ErrPKIndexCantBeInvisible: mysql.Message("A primary key index cannot be invisible", nil),
@@ -1201,4 +1200,5 @@ var MySQLErrName = map[uint16]*mysql.ErrMessage{
12011200
ErrWarnGlobalIndexNeedManuallyAnalyze: mysql.Message("Auto analyze is not effective for index '%-.192s', need analyze manually", nil),
12021201
ErrTimeStampInDSTTransition: mysql.Message("Timestamp is not valid, since it is in Daylight Saving Time transition '%s' for time zone '%s'", nil),
12031202
ErrInvalidAffinityOption: mysql.Message("Invalid AFFINITY %s", nil),
1203+
ErrUserPrefixMismatch: mysql.Message("User name prefix does not match the assigned keyspace.", nil),
12041204
}

0 commit comments

Comments
 (0)