diff --git a/go.mod b/go.mod index e9a014b9c..01dd7c47a 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/cznic/y v0.0.0-20170802143616-045f81c6662a github.com/go-sql-driver/mysql v1.5.0 github.com/pingcap/check v0.0.0-20190102082844-67f458068fc8 - github.com/pingcap/errors v0.11.5-0.20201021055732-210aacd3fd99 + github.com/pingcap/errors v0.11.5-0.20201029093017-5a7df2af2ac7 github.com/pingcap/log v0.0.0-20200511115504-543df19646ad github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237 // indirect go.uber.org/atomic v1.7.0 // indirect diff --git a/go.sum b/go.sum index d5ff06c82..05fdd4515 100644 --- a/go.sum +++ b/go.sum @@ -27,8 +27,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/pingcap/check v0.0.0-20190102082844-67f458068fc8 h1:USx2/E1bX46VG32FIw034Au6seQ2fY9NEILmNh/UlQg= github.com/pingcap/check v0.0.0-20190102082844-67f458068fc8/go.mod h1:B1+S9LNcuMyLH/4HMTViQOJevkGiik3wW2AN9zb2fNQ= github.com/pingcap/errors v0.11.0/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= -github.com/pingcap/errors v0.11.5-0.20201021055732-210aacd3fd99 h1:PVuEvTi/LlviMG7X3av44NRwcdPf0tiqL/YdVOIKCpA= -github.com/pingcap/errors v0.11.5-0.20201021055732-210aacd3fd99/go.mod h1:G7x87le1poQzLB/TqvTJI2ILrSgobnq4Ut7luOwvfvI= +github.com/pingcap/errors v0.11.5-0.20201029093017-5a7df2af2ac7 h1:wQKuKP2HUtej2gSvx1cZmY4DENUH6tlOxRkfvPT8EBU= +github.com/pingcap/errors v0.11.5-0.20201029093017-5a7df2af2ac7/go.mod h1:G7x87le1poQzLB/TqvTJI2ILrSgobnq4Ut7luOwvfvI= github.com/pingcap/log v0.0.0-20200511115504-543df19646ad h1:SveG82rmu/GFxYanffxsSF503SiQV+2JLnWEiGiF+Tc= github.com/pingcap/log v0.0.0-20200511115504-543df19646ad/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= diff --git a/terror/terror.go b/terror/terror.go index 5fb1cefc1..8a155b608 100644 --- a/terror/terror.go +++ b/terror/terror.go @@ -157,9 +157,9 @@ func (ec ErrClass) New(code ErrCode, message string) *Error { // NewStdErr defines an *Error with an error code, an error // message and workaround to create standard error. -func (ec ErrClass) NewStdErr(code ErrCode, message *mysql.ErrMessage, desc string, workaround string) *Error { +func (ec ErrClass) NewStdErr(code ErrCode, message *mysql.ErrMessage) *Error { rfcCode := ec.initError(code) - err := errors.Normalize(message.Raw, errors.RedactArgs(message.RedactArgPos), errors.MySQLErrorCode(int(code)), errors.RFCCodeText(rfcCode), errors.Description(desc), errors.Workaround(workaround)) + err := errors.Normalize(message.Raw, errors.RedactArgs(message.RedactArgPos), errors.MySQLErrorCode(int(code)), errors.RFCCodeText(rfcCode)) errCodeMap[code] = err return err } @@ -169,7 +169,7 @@ func (ec ErrClass) NewStdErr(code ErrCode, message *mysql.ErrMessage, desc strin // this method is not goroutine-safe and // usually be used in global variable initializer func (ec ErrClass) NewStd(code ErrCode) *Error { - return ec.NewStdErr(code, mysql.MySQLErrName[uint16(code)], "", "") + return ec.NewStdErr(code, mysql.MySQLErrName[uint16(code)]) } // Synthesize synthesizes an *Error in the air @@ -215,8 +215,8 @@ func getMySQLErrorCode(e *Error) uint16 { var ( // ErrClassToMySQLCodes is the map of ErrClass to code-set. ErrClassToMySQLCodes = make(map[ErrClass]map[ErrCode]struct{}) - ErrCritical = ClassGlobal.NewStdErr(CodeExecResultIsEmpty, mysql.Message("critical error %v", nil), "", "") - ErrResultUndetermined = ClassGlobal.NewStdErr(CodeResultUndetermined, mysql.Message("execution result undetermined", nil), "", "") + ErrCritical = ClassGlobal.NewStdErr(CodeExecResultIsEmpty, mysql.Message("critical error %v", nil)) + ErrResultUndetermined = ClassGlobal.NewStdErr(CodeResultUndetermined, mysql.Message("execution result undetermined", nil)) ) func init() { diff --git a/yy_parser.go b/yy_parser.go index 526090867..efe0c24d7 100644 --- a/yy_parser.go +++ b/yy_parser.go @@ -52,7 +52,7 @@ var ( // ErrWarnDeprecatedSyntaxNoReplacement return when the syntax was deprecated and there is no replacement. ErrWarnDeprecatedSyntaxNoReplacement = terror.ClassParser.NewStd(mysql.ErrWarnDeprecatedSyntaxNoReplacement) // ErrWarnDeprecatedIntegerDisplayWidth share the same code 1681, and it will be returned when length is specified in integer. - ErrWarnDeprecatedIntegerDisplayWidth = terror.ClassParser.NewStdErr(mysql.ErrWarnDeprecatedSyntaxNoReplacement, mysql.Message("Integer display width is deprecated and will be removed in a future release.", nil), "", "") + ErrWarnDeprecatedIntegerDisplayWidth = terror.ClassParser.NewStdErr(mysql.ErrWarnDeprecatedSyntaxNoReplacement, mysql.Message("Integer display width is deprecated and will be removed in a future release.", nil)) // SpecFieldPattern special result field pattern SpecFieldPattern = regexp.MustCompile(`(\/\*!(M?[0-9]{5,6})?|\*\/)`) specCodeStart = regexp.MustCompile(`^\/\*!(M?[0-9]{5,6})?[ \t]*`)