Delete pkg/parser/mysql/errcode.go and pkg/parser/mysql/errname.go an…

…d use error codes and messages in pkg/errno.

pkg/ddl/column_type_change_test.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/tidb/pkg/ddl"
+	"github.com/pingcap/tidb/pkg/errno"
 	"github.com/pingcap/tidb/pkg/kv"
 	"github.com/pingcap/tidb/pkg/meta/model"
 	"github.com/pingcap/tidb/pkg/parser/mysql"
@@ -175,10 +176,10 @@ var mockTerrorMap = make(map[string]*terror.Error)
 
 func init() {
 	// Since terror new action will cause data race with other test suite (getTerrorCode) in parallel, we init it all here.
-	mockTerrorMap[model.StateNone.String()] = dbterror.ClassDDL.NewStdErr(1, mysql.Message("MockRollingBackInCallBack-"+model.StateNone.String(), nil))
-	mockTerrorMap[model.StateDeleteOnly.String()] = dbterror.ClassDDL.NewStdErr(1, mysql.Message("MockRollingBackInCallBack-"+model.StateDeleteOnly.String(), nil))
-	mockTerrorMap[model.StateWriteOnly.String()] = dbterror.ClassDDL.NewStdErr(1, mysql.Message("MockRollingBackInCallBack-"+model.StateWriteOnly.String(), nil))
-	mockTerrorMap[model.StateWriteReorganization.String()] = dbterror.ClassDDL.NewStdErr(1, mysql.Message("MockRollingBackInCallBack-"+model.StateWriteReorganization.String(), nil))
+	mockTerrorMap[model.StateNone.String()] = dbterror.ClassDDL.NewStdErr(1, errno.Message("MockRollingBackInCallBack-"+model.StateNone.String(), nil))
+	mockTerrorMap[model.StateDeleteOnly.String()] = dbterror.ClassDDL.NewStdErr(1, errno.Message("MockRollingBackInCallBack-"+model.StateDeleteOnly.String(), nil))
+	mockTerrorMap[model.StateWriteOnly.String()] = dbterror.ClassDDL.NewStdErr(1, errno.Message("MockRollingBackInCallBack-"+model.StateWriteOnly.String(), nil))
+	mockTerrorMap[model.StateWriteReorganization.String()] = dbterror.ClassDDL.NewStdErr(1, errno.Message("MockRollingBackInCallBack-"+model.StateWriteReorganization.String(), nil))
 }
 
 // Test issue #20529.

pkg/domain/domain.go

@@ -3399,7 +3399,7 @@ var (
 	ErrInfoSchemaExpired = dbterror.ClassDomain.NewStd(errno.ErrInfoSchemaExpired)
 	// ErrInfoSchemaChanged returns the error that information schema is changed.
 	ErrInfoSchemaChanged = dbterror.ClassDomain.NewStdErr(errno.ErrInfoSchemaChanged,
-		mysql.Message(errno.MySQLErrName[errno.ErrInfoSchemaChanged].Raw+". "+kv.TxnRetryableMark, nil))
+		errno.Message(errno.MySQLErrName[errno.ErrInfoSchemaChanged].Raw+". "+kv.TxnRetryableMark, nil))
 )
 
 // SysProcesses holds the sys processes infos

pkg/errno/BUILD.bazel

@@ -9,7 +9,6 @@ go_library(
     ],
     importpath = "github.com/pingcap/tidb/pkg/errno",
     visibility = ["//visibility:public"],
-    deps = ["//pkg/parser/mysql"],
 )
 
 go_test(

pkg/executor/insert.go

@@ -565,7 +565,7 @@ func (e *InsertExec) setMessage() {
 				numDuplicates = stmtCtx.UpdatedRows()
 			}
 		}
-		msg := fmt.Sprintf(mysql.MySQLErrName[mysql.ErrInsertInfo].Raw, numRecords, numDuplicates, numWarnings)
+		msg := fmt.Sprintf(errno.MySQLErrName[errno.ErrInsertInfo].Raw, numRecords, numDuplicates, numWarnings)
 		stmtCtx.SetMessage(msg)
 	}
 }

pkg/executor/load_data.go

@@ -26,6 +26,7 @@ import (
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/tidb/br/pkg/storage"
 	"github.com/pingcap/tidb/pkg/errctx"
+	"github.com/pingcap/tidb/pkg/errno"
 	"github.com/pingcap/tidb/pkg/executor/importer"
 	"github.com/pingcap/tidb/pkg/executor/internal/exec"
 	"github.com/pingcap/tidb/pkg/expression"
@@ -276,7 +277,7 @@ func (e *LoadDataWorker) setResult(colAssignExprWarnings []contextutil.SQLWarn)
 		numWarnings = math.MaxUint16
 	}
 
-	msg := fmt.Sprintf(mysql.MySQLErrName[mysql.ErrLoadInfo].Raw, numRecords, numDeletes, numSkipped, numWarnings)
+	msg := fmt.Sprintf(errno.MySQLErrName[errno.ErrLoadInfo].Raw, numRecords, numDeletes, numSkipped, numWarnings)
 	warns := make([]contextutil.SQLWarn, numWarnings)
 	n := copy(warns, stmtCtx.GetWarnings())
 	for i := 0; i < int(numRecords) && n < len(warns); i++ {

pkg/executor/replace.go

@@ -20,10 +20,10 @@ import (
 	"runtime/trace"
 	"time"
 
+	"github.com/pingcap/tidb/pkg/errno"
 	"github.com/pingcap/tidb/pkg/executor/internal/exec"
 	"github.com/pingcap/tidb/pkg/kv"
 	"github.com/pingcap/tidb/pkg/meta/autoid"
-	"github.com/pingcap/tidb/pkg/parser/mysql"
 	"github.com/pingcap/tidb/pkg/table"
 	"github.com/pingcap/tidb/pkg/table/tables"
 	"github.com/pingcap/tidb/pkg/tablecodec"
@@ -213,7 +213,7 @@ func (e *ReplaceExec) setMessage() {
 	if e.SelectExec != nil || numRecords > 1 {
 		numWarnings := stmtCtx.WarningCount()
 		numDuplicates := stmtCtx.AffectedRows() - numRecords
-		msg := fmt.Sprintf(mysql.MySQLErrName[mysql.ErrInsertInfo].Raw, numRecords, numDuplicates, numWarnings)
+		msg := fmt.Sprintf(errno.MySQLErrName[errno.ErrInsertInfo].Raw, numRecords, numDuplicates, numWarnings)
 		stmtCtx.SetMessage(msg)
 	}
 }

pkg/executor/show.go

@@ -35,6 +35,7 @@ import (
 	"github.com/pingcap/tidb/pkg/disttask/importinto"
 	"github.com/pingcap/tidb/pkg/domain"
 	"github.com/pingcap/tidb/pkg/domain/infosync"
+	"github.com/pingcap/tidb/pkg/errno"
 	"github.com/pingcap/tidb/pkg/executor/importer"
 	"github.com/pingcap/tidb/pkg/executor/internal/exec"
 	"github.com/pingcap/tidb/pkg/expression"
@@ -1986,7 +1987,7 @@ func (e *ShowExec) fetchShowWarnings(errOnly bool) error {
 			if warn != nil {
 				err = warn.Error()
 			}
-			e.appendRow([]any{w.Level, int64(mysql.ErrUnknown), err})
+			e.appendRow([]any{w.Level, int64(errno.ErrUnknown), err})
 		}
 	}
 	return nil

pkg/executor/update.go

@@ -21,6 +21,7 @@ import (
 	"runtime/trace"
 
 	"github.com/pingcap/errors"
+	"github.com/pingcap/tidb/pkg/errno"
 	"github.com/pingcap/tidb/pkg/executor/internal/exec"
 	"github.com/pingcap/tidb/pkg/expression"
 	"github.com/pingcap/tidb/pkg/kv"
@@ -566,7 +567,7 @@ func (e *UpdateExec) setMessage() {
 	numMatched := e.matched
 	numChanged := stmtCtx.UpdatedRows()
 	numWarnings := stmtCtx.WarningCount()
-	msg := fmt.Sprintf(mysql.MySQLErrName[mysql.ErrUpdateInfo].Raw, numMatched, numChanged, numWarnings)
+	msg := fmt.Sprintf(errno.MySQLErrName[errno.ErrUpdateInfo].Raw, numMatched, numChanged, numWarnings)
 	stmtCtx.SetMessage(msg)
 }
 

pkg/expression/builtin_miscellaneous.go

@@ -27,6 +27,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/pingcap/errors"
+	"github.com/pingcap/tidb/pkg/errno"
 	"github.com/pingcap/tidb/pkg/expression/expropt"
 	"github.com/pingcap/tidb/pkg/parser/mysql"
 	"github.com/pingcap/tidb/pkg/parser/terror"
@@ -251,9 +252,9 @@ func (b *builtinLockSig) evalInt(ctx EvalContext, row chunk.Row) (int64, bool, e
 	if err != nil {
 		if terr, ok := errors.Cause(err).(*terror.Error); ok {
 			switch terr.Code() {
-			case mysql.ErrLockWaitTimeout:
+			case errno.ErrLockWaitTimeout:
 				return 0, false, nil // Another user has the lock
-			case mysql.ErrLockDeadlock:
+			case errno.ErrLockDeadlock:
 				// Currently this code is not reachable because each Advisory Lock
 				// Uses a separate session. Deadlock detection does not work across
 				// independent sessions.

pkg/expression/errors.go

@@ -17,7 +17,6 @@ package expression
 import (
 	"github.com/pingcap/errors"
 	mysql "github.com/pingcap/tidb/pkg/errno"
-	pmysql "github.com/pingcap/tidb/pkg/parser/mysql"
 	"github.com/pingcap/tidb/pkg/types"
 	"github.com/pingcap/tidb/pkg/util/dbterror"
 )
@@ -30,7 +29,7 @@ var (
 	ErrRegexp                      = dbterror.ClassExpression.NewStd(mysql.ErrRegexp)
 	ErrOperandColumns              = dbterror.ClassExpression.NewStd(mysql.ErrOperandColumns)
 	ErrCutValueGroupConcat         = dbterror.ClassExpression.NewStd(mysql.ErrCutValueGroupConcat)
-	ErrFunctionsNoopImpl           = dbterror.ClassExpression.NewStdErr(mysql.ErrNotSupportedYet, pmysql.Message("function %s has only noop implementation in tidb now, use tidb_enable_noop_functions to enable these functions", nil))
+	ErrFunctionsNoopImpl           = dbterror.ClassExpression.NewStdErr(mysql.ErrNotSupportedYet, mysql.Message("function %s has only noop implementation in tidb now, use tidb_enable_noop_functions to enable these functions", nil))
 	ErrInvalidArgumentForLogarithm = dbterror.ClassExpression.NewStd(mysql.ErrInvalidArgumentForLogarithm)
 	ErrIncorrectType               = dbterror.ClassExpression.NewStd(mysql.ErrIncorrectType)
 	ErrInvalidTypeForJSON          = dbterror.ClassExpression.NewStd(mysql.ErrInvalidTypeForJSON)
@@ -46,7 +45,7 @@ var (
 	errZlibZBuf                      = dbterror.ClassExpression.NewStd(mysql.ErrZlibZBuf)
 	errIncorrectArgs                 = dbterror.ClassExpression.NewStd(mysql.ErrWrongArguments)
 	errUnknownCharacterSet           = dbterror.ClassExpression.NewStd(mysql.ErrUnknownCharacterSet)
-	errDefaultValue                  = dbterror.ClassExpression.NewStdErr(mysql.ErrInvalidDefault, pmysql.Message("invalid default value", nil))
+	errDefaultValue                  = dbterror.ClassExpression.NewStdErr(mysql.ErrInvalidDefault, mysql.Message("invalid default value", nil))
 	errDeprecatedSyntaxNoReplacement = dbterror.ClassExpression.NewStd(mysql.ErrWarnDeprecatedSyntaxNoReplacement)
 	errWarnAllowedPacketOverflowed   = dbterror.ClassExpression.NewStd(mysql.ErrWarnAllowedPacketOverflowed)
 	errWarnOptionIgnored             = dbterror.ClassExpression.NewStd(mysql.WarnOptionIgnored)
@@ -64,7 +63,7 @@ var (
 	// Sequence usage privilege check.
 	errSequenceAccessDenied      = dbterror.ClassExpression.NewStd(mysql.ErrTableaccessDenied)
 	errUnsupportedJSONComparison = dbterror.ClassExpression.NewStdErr(mysql.ErrNotSupportedYet,
-		pmysql.Message("comparison of JSON in the LEAST and GREATEST operators", nil))
+		mysql.Message("comparison of JSON in the LEAST and GREATEST operators", nil))
 )
 
 // handleInvalidTimeError reports error or warning depend on the context.

pkg/kv/BUILD.bazel

@@ -26,7 +26,6 @@ go_library(
         "//pkg/errno",
         "//pkg/meta/model",
         "//pkg/parser",
-        "//pkg/parser/mysql",
         "//pkg/parser/terror",
         "//pkg/resourcegroup",
         "//pkg/types",

pkg/kv/error.go

@@ -17,8 +17,8 @@ package kv
 import (
 	"strings"
 
+	"github.com/pingcap/tidb/pkg/errno"
 	mysql "github.com/pingcap/tidb/pkg/errno"
-	pmysql "github.com/pingcap/tidb/pkg/parser/mysql"
 	"github.com/pingcap/tidb/pkg/util/dbterror"
 )
 
@@ -34,7 +34,7 @@ var (
 	// subject to change it in the future.
 	ErrTxnRetryable = dbterror.ClassKV.NewStdErr(
 		mysql.ErrTxnRetryable,
-		pmysql.Message(
+		errno.Message(
 			mysql.MySQLErrName[mysql.ErrTxnRetryable].Raw+TxnRetryableMark,
 			mysql.MySQLErrName[mysql.ErrTxnRetryable].RedactArgPos,
 		),
@@ -57,15 +57,15 @@ var (
 	// ErrWriteConflict is the error when the commit meets an write conflict error.
 	ErrWriteConflict = dbterror.ClassKV.NewStdErr(
 		mysql.ErrWriteConflict,
-		pmysql.Message(
+		errno.Message(
 			mysql.MySQLErrName[mysql.ErrWriteConflict].Raw+" "+TxnRetryableMark,
 			mysql.MySQLErrName[mysql.ErrWriteConflict].RedactArgPos,
 		),
 	)
 	// ErrWriteConflictInTiDB is the error when the commit meets an write conflict error when local latch is enabled.
 	ErrWriteConflictInTiDB = dbterror.ClassKV.NewStdErr(
 		mysql.ErrWriteConflictInTiDB,
-		pmysql.Message(
+		errno.Message(
 			mysql.MySQLErrName[mysql.ErrWriteConflictInTiDB].Raw+" "+TxnRetryableMark,
 			mysql.MySQLErrName[mysql.ErrWriteConflictInTiDB].RedactArgPos,
 		),

pkg/lightning/common/util.go

@@ -97,7 +97,7 @@ func tryConnectMySQL(cfg *mysql.Config) (*sql.DB, error) {
 	failpoint.Inject("MustMySQLPassword", func(val failpoint.Value) {
 		pwd := val.(string)
 		if cfg.Passwd != pwd {
-			failpoint.Return(nil, &mysql.MySQLError{Number: tmysql.ErrAccessDenied, Message: "access denied"})
+			failpoint.Return(nil, &mysql.MySQLError{Number: errno.ErrAccessDenied, Message: "access denied"})
 		}
 		failpoint.Return(nil, nil)
 	})
@@ -122,7 +122,7 @@ func ConnectMySQL(cfg *mysql.Config) (*sql.DB, error) {
 		return db, nil
 	}
 	// If access is denied and password is encoded by base64, try the decoded string as well.
-	if mysqlErr, ok := errors.Cause(firstErr).(*mysql.MySQLError); ok && mysqlErr.Number == tmysql.ErrAccessDenied {
+	if mysqlErr, ok := errors.Cause(firstErr).(*mysql.MySQLError); ok && mysqlErr.Number == errno.ErrAccessDenied {
 		// If password is encoded by base64, try the decoded string as well.
 		password, decodeErr := base64.StdEncoding.DecodeString(cfg.Passwd)
 		if decodeErr == nil && string(password) != cfg.Passwd {

pkg/meta/meta.go

@@ -134,9 +134,9 @@ const (
 
 var (
 	// ErrDBExists is the error for db exists.
-	ErrDBExists = dbterror.ClassMeta.NewStd(mysql.ErrDBCreateExists)
+	ErrDBExists = dbterror.ClassMeta.NewStd(errno.ErrDBCreateExists)
 	// ErrDBNotExists is the error for db not exists.
-	ErrDBNotExists = dbterror.ClassMeta.NewStd(mysql.ErrBadDB)
+	ErrDBNotExists = dbterror.ClassMeta.NewStd(errno.ErrBadDB)
 	// ErrPolicyExists is the error for policy exists.
 	ErrPolicyExists = dbterror.ClassMeta.NewStd(errno.ErrPlacementPolicyExists)
 	// ErrPolicyNotExists is the error for policy not exists.
@@ -146,9 +146,9 @@ var (
 	// ErrResourceGroupNotExists is the error for resource group not exists.
 	ErrResourceGroupNotExists = dbterror.ClassMeta.NewStd(errno.ErrResourceGroupNotExists)
 	// ErrTableExists is the error for table exists.
-	ErrTableExists = dbterror.ClassMeta.NewStd(mysql.ErrTableExists)
+	ErrTableExists = dbterror.ClassMeta.NewStd(errno.ErrTableExists)
 	// ErrTableNotExists is the error for table not exists.
-	ErrTableNotExists = dbterror.ClassMeta.NewStd(mysql.ErrNoSuchTable)
+	ErrTableNotExists = dbterror.ClassMeta.NewStd(errno.ErrNoSuchTable)
 	// ErrDDLReorgElementNotExist is the error for reorg element not exists.
 	ErrDDLReorgElementNotExist = dbterror.ClassMeta.NewStd(errno.ErrDDLReorgElementNotExist)
 	// ErrInvalidString is the error for invalid string to parse

pkg/parser/BUILD.bazel

@@ -21,6 +21,7 @@ go_library(
     importpath = "github.com/pingcap/tidb/pkg/parser",
     visibility = ["//visibility:public"],
     deps = [
+        "//pkg/errno",
         "//pkg/parser/ast",
         "//pkg/parser/auth",
         "//pkg/parser/charset",

pkg/parser/ast/BUILD.bazel

@@ -19,6 +19,7 @@ go_library(
     importpath = "github.com/pingcap/tidb/pkg/parser/ast",
     visibility = ["//visibility:public"],
     deps = [
+        "//pkg/errno",
         "//pkg/parser/auth",
         "//pkg/parser/charset",
         "//pkg/parser/format",

pkg/parser/ast/ddl.go

@@ -18,9 +18,9 @@ import (
 	"strings"
 
 	"github.com/pingcap/errors"
+	"github.com/pingcap/tidb/pkg/errno"
 	"github.com/pingcap/tidb/pkg/parser/auth"
 	"github.com/pingcap/tidb/pkg/parser/format"
-	"github.com/pingcap/tidb/pkg/parser/mysql"
 	"github.com/pingcap/tidb/pkg/parser/terror"
 	"github.com/pingcap/tidb/pkg/parser/tidb"
 	"github.com/pingcap/tidb/pkg/parser/types"
@@ -4004,21 +4004,21 @@ func (n *TruncateTableStmt) Accept(v Visitor) (Node, bool) {
 }
 
 var (
-	ErrNoParts                              = terror.ClassDDL.NewStd(mysql.ErrNoParts)
-	ErrPartitionColumnList                  = terror.ClassDDL.NewStd(mysql.ErrPartitionColumnList)
-	ErrPartitionRequiresValues              = terror.ClassDDL.NewStd(mysql.ErrPartitionRequiresValues)
-	ErrPartitionsMustBeDefined              = terror.ClassDDL.NewStd(mysql.ErrPartitionsMustBeDefined)
-	ErrPartitionWrongNoPart                 = terror.ClassDDL.NewStd(mysql.ErrPartitionWrongNoPart)
-	ErrPartitionWrongNoSubpart              = terror.ClassDDL.NewStd(mysql.ErrPartitionWrongNoSubpart)
-	ErrPartitionWrongValues                 = terror.ClassDDL.NewStd(mysql.ErrPartitionWrongValues)
-	ErrRowSinglePartitionField              = terror.ClassDDL.NewStd(mysql.ErrRowSinglePartitionField)
-	ErrSubpartition                         = terror.ClassDDL.NewStd(mysql.ErrSubpartition)
-	ErrSystemVersioningWrongPartitions      = terror.ClassDDL.NewStd(mysql.ErrSystemVersioningWrongPartitions)
-	ErrTooManyValues                        = terror.ClassDDL.NewStd(mysql.ErrTooManyValues)
-	ErrWrongPartitionTypeExpectedSystemTime = terror.ClassDDL.NewStd(mysql.ErrWrongPartitionTypeExpectedSystemTime)
-	ErrUnknownCharacterSet                  = terror.ClassDDL.NewStd(mysql.ErrUnknownCharacterSet)
-	ErrCoalescePartitionNoPartition         = terror.ClassDDL.NewStd(mysql.ErrCoalescePartitionNoPartition)
-	ErrWrongUsage                           = terror.ClassDDL.NewStd(mysql.ErrWrongUsage)
+	ErrNoParts                              = terror.ClassDDL.NewStd(errno.ErrNoParts)
+	ErrPartitionColumnList                  = terror.ClassDDL.NewStd(errno.ErrPartitionColumnList)
+	ErrPartitionRequiresValues              = terror.ClassDDL.NewStd(errno.ErrPartitionRequiresValues)
+	ErrPartitionsMustBeDefined              = terror.ClassDDL.NewStd(errno.ErrPartitionsMustBeDefined)
+	ErrPartitionWrongNoPart                 = terror.ClassDDL.NewStd(errno.ErrPartitionWrongNoPart)
+	ErrPartitionWrongNoSubpart              = terror.ClassDDL.NewStd(errno.ErrPartitionWrongNoSubpart)
+	ErrPartitionWrongValues                 = terror.ClassDDL.NewStd(errno.ErrPartitionWrongValues)
+	ErrRowSinglePartitionField              = terror.ClassDDL.NewStd(errno.ErrRowSinglePartitionField)
+	ErrSubpartition                         = terror.ClassDDL.NewStd(errno.ErrSubpartition)
+	ErrSystemVersioningWrongPartitions      = terror.ClassDDL.NewStd(errno.ErrSystemVersioningWrongPartitions)
+	ErrTooManyValues                        = terror.ClassDDL.NewStd(errno.ErrTooManyValues)
+	ErrWrongPartitionTypeExpectedSystemTime = terror.ClassDDL.NewStd(errno.ErrWrongPartitionTypeExpectedSystemTime)
+	ErrUnknownCharacterSet                  = terror.ClassDDL.NewStd(errno.ErrUnknownCharacterSet)
+	ErrCoalescePartitionNoPartition         = terror.ClassDDL.NewStd(errno.ErrCoalescePartitionNoPartition)
+	ErrWrongUsage                           = terror.ClassDDL.NewStd(errno.ErrWrongUsage)
 )
 
 type SubPartitionDefinition struct {

pkg/parser/charset/BUILD.bazel

@@ -16,6 +16,7 @@ go_library(
     importpath = "github.com/pingcap/tidb/pkg/parser/charset",
     visibility = ["//visibility:public"],
     deps = [
+        "//pkg/errno",
         "//pkg/parser/mysql",
         "//pkg/parser/terror",
         "@com_github_pingcap_errors//:errors",

pkg/parser/charset/charset.go

@@ -19,16 +19,17 @@ import (
 
 	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
+	"github.com/pingcap/tidb/pkg/errno"
 	"github.com/pingcap/tidb/pkg/parser/mysql"
 	"github.com/pingcap/tidb/pkg/parser/terror"
 	"go.uber.org/zap"
 )
 
 var (
 	// ErrUnknownCollation is unknown collation.
-	ErrUnknownCollation = terror.ClassDDL.NewStd(mysql.ErrUnknownCollation)
+	ErrUnknownCollation = terror.ClassDDL.NewStd(errno.ErrUnknownCollation)
 	// ErrCollationCharsetMismatch is collation charset mismatch.
-	ErrCollationCharsetMismatch = terror.ClassDDL.NewStd(mysql.ErrCollationCharsetMismatch)
+	ErrCollationCharsetMismatch = terror.ClassDDL.NewStd(errno.ErrCollationCharsetMismatch)
 )
 
 var (

pkg/parser/charset/encoding_base.go

@@ -20,14 +20,14 @@ import (
 	"strings"
 	"unsafe"
 
-	"github.com/pingcap/tidb/pkg/parser/mysql"
+	"github.com/pingcap/tidb/pkg/errno"
 	"github.com/pingcap/tidb/pkg/parser/terror"
 	"golang.org/x/text/encoding"
 	"golang.org/x/text/transform"
 )
 
 // ErrInvalidCharacterString returns when the string is invalid in the specific charset.
-var ErrInvalidCharacterString = terror.ClassParser.NewStd(mysql.ErrInvalidCharacterString)
+var ErrInvalidCharacterString = terror.ClassParser.NewStd(errno.ErrInvalidCharacterString)
 
 // encodingBase defines some generic functions.
 type encodingBase struct {