expression: fix default value of GetDefaultCollationForUTF8MB4 of `…

…StaticExprContext` (pingcap#53391) close pingcap#53390
terry1purcell · May 20, 2024 · 9bd7633 · 9bd7633
1 parent 7f0a194
commit 9bd7633
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/expression/contextstatic/exprctx.go b/pkg/expression/contextstatic/exprctx.go
@@ -162,7 +162,7 @@ func NewStaticExprContext(opts ...StaticExprCtxOption) *StaticExprContext {
 		staticExprCtxState: staticExprCtxState{
 			charset:                    cs.Name,
 			collation:                  cs.DefaultCollation,
-			defaultCollationForUTF8MB4: variable.DefaultCollationForUTF8MB4,
+			defaultCollationForUTF8MB4: mysql.DefaultCollationName,
 			blockEncryptionMode:        variable.DefBlockEncryptionMode,
 			sysDateIsNow:               variable.DefSysdateIsNow,
 			noopFuncsMode:              variable.TiDBOptOnOffWarn(variable.DefTiDBEnableNoopFuncs),

diff --git a/pkg/expression/contextstatic/exprctx_test.go b/pkg/expression/contextstatic/exprctx_test.go
@@ -70,7 +70,7 @@ func checkDefaultStaticExprCtx(t *testing.T, ctx *StaticExprContext) {
 	require.NoError(t, err)
 	require.Equal(t, charsetName, cs.Name)
 	require.Equal(t, cs.DefaultCollation, collation)
-	require.Equal(t, variable.DefaultCollationForUTF8MB4, ctx.GetDefaultCollationForUTF8MB4())
+	require.Equal(t, mysql.DefaultCollationName, ctx.GetDefaultCollationForUTF8MB4())
 	require.Equal(t, variable.DefBlockEncryptionMode, ctx.GetBlockEncryptionMode())
 	require.Equal(t, variable.DefSysdateIsNow, ctx.GetSysdateIsNow())
 	require.Equal(t, variable.TiDBOptOnOffWarn(variable.DefTiDBEnableNoopFuncs), ctx.GetNoopFuncsMode())