From dbdf64d3d77798deacd443efd87f4b06f0a7243d Mon Sep 17 00:00:00 2001 From: lysu Date: Fri, 5 Jun 2020 12:43:49 +0800 Subject: [PATCH] cherry pick #17368 to release-3.0 Signed-off-by: sre-bot --- expression/aggregation/base_func.go | 1 + expression/typeinfer_test.go | 1 + 2 files changed, 2 insertions(+) diff --git a/expression/aggregation/base_func.go b/expression/aggregation/base_func.go index 362ae62b31e9e..4a39dd29e5dd2 100644 --- a/expression/aggregation/base_func.go +++ b/expression/aggregation/base_func.go @@ -116,6 +116,7 @@ func (a *baseFuncDesc) typeInfer(ctx sessionctx.Context) error { func (a *baseFuncDesc) typeInfer4Count(ctx sessionctx.Context) { a.RetTp = types.NewFieldType(mysql.TypeLonglong) a.RetTp.Flen = 21 + a.RetTp.Decimal = 0 types.SetBinChsClnFlag(a.RetTp) } diff --git a/expression/typeinfer_test.go b/expression/typeinfer_test.go index b5ecc82b038e2..ebf1ee4d9f158 100644 --- a/expression/typeinfer_test.go +++ b/expression/typeinfer_test.go @@ -833,6 +833,7 @@ func (s *testInferTypeSuite) createTestCase4Aggregations() []typeInferTestCase { {"avg(1.2e2)", mysql.TypeDouble, charset.CharsetBin, mysql.BinaryFlag, mysql.MaxRealWidth, types.UnspecifiedLength}, {"avg(c_char)", mysql.TypeDouble, charset.CharsetBin, mysql.BinaryFlag, mysql.MaxRealWidth, types.UnspecifiedLength}, {"group_concat(c_int_d)", mysql.TypeVarString, charset.CharsetUTF8MB4, 0, mysql.MaxBlobWidth, 0}, + {"count(c_decimal)", mysql.TypeLonglong, charset.CharsetBin, mysql.BinaryFlag, 21, 0}, } }