cherry pick

Signed-off-by: ekexium <[email protected]>

util/codec/codec.go

@@ -156,9 +156,9 @@ func EstimateValueSize(sc *stmtctx.StatementContext, val types.Datum) (int, erro
 	case types.KindMysqlDecimal:
 		l = valueSizeOfDecimal(val.GetMysqlDecimal(), val.Length(), val.Frac()) + 1
 	case types.KindMysqlEnum:
-		l = valueSizeOfUnsignedInt(uint64(val.GetMysqlEnum().ToNumber()))
+		l = valueSizeOfUnsignedInt(val.GetMysqlEnum().Value)
 	case types.KindMysqlSet:
-		l = valueSizeOfUnsignedInt(uint64(val.GetMysqlSet().ToNumber()))
+		l = valueSizeOfUnsignedInt(val.GetMysqlSet().Value)
 	case types.KindMysqlBit, types.KindBinaryLiteral:
 		val, err := val.GetBinaryLiteral().ToInt(sc)
 		terror.Log(errors.Trace(err))
@@ -352,11 +352,11 @@ func encodeHashChunkRowIdx(sc *stmtctx.StatementContext, row chunk.Row, tp *type
 	case mysql.TypeEnum:
 		if mysql.HasEnumSetAsIntFlag(tp.Flag) {
 			flag = uvarintFlag
-			v := uint64(row.GetEnum(idx).ToNumber())
+			v := row.GetEnum(idx).Value
 			b = (*[sizeUint64]byte)(unsafe.Pointer(&v))[:]
 		} else {
 			flag = compactBytesFlag
-			v := uint64(row.GetEnum(idx).ToNumber())
+			v := row.GetEnum(idx).Value
 			str := ""
 			if enum, err := types.ParseEnumValue(tp.Elems, v); err == nil {
 				// str will be empty string if v out of definition of enum.
@@ -566,11 +566,11 @@ func HashChunkSelected(sc *stmtctx.StatementContext, h []hash.Hash64, chk *chunk
 				isNull[i] = !ignoreNull
 			} else if mysql.HasEnumSetAsIntFlag(tp.Flag) {
 				buf[0] = uvarintFlag
-				v := uint64(column.GetEnum(i).ToNumber())
+				v := column.GetEnum(i).Value
 				b = (*[sizeUint64]byte)(unsafe.Pointer(&v))[:]
 			} else {
 				buf[0] = compactBytesFlag
-				v := uint64(column.GetEnum(i).ToNumber())
+				v := column.GetEnum(i).Value
 				str := ""
 				if enum, err := types.ParseEnumValue(tp.Elems, v); err == nil {
 					// str will be empty string if v out of definition of enum.