Merge branch 'master' into aes

pingcap · zz-jason · Sep 23, 2018 · Aug 15, 2018 · Aug 17, 2018 · Aug 17, 2018
commit 58e1efde91da7c2efd814b400d10e96a38685003
diff --git a/expression/errors.go b/expression/errors.go
@@ -39,6 +39,7 @@ var (
 	errBadField                      = terror.ClassExpression.New(mysql.ErrBadField, mysql.MySQLErrName[mysql.ErrBadField])
 	errWarnAllowedPacketOverflowed   = terror.ClassExpression.New(mysql.ErrWarnAllowedPacketOverflowed, mysql.MySQLErrName[mysql.ErrWarnAllowedPacketOverflowed])
 	errWarnOptionIgnored             = terror.ClassExpression.New(mysql.WarnOptionIgnored, mysql.MySQLErrName[mysql.WarnOptionIgnored])
+	errTruncatedWrongValue           = terror.ClassExpression.New(mysql.ErrTruncatedWrongValue, mysql.MySQLErrName[mysql.ErrTruncatedWrongValue])
 )
 
 func init() {