This is an automated cherry-pick of #55991

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
pingcap · Sep 10, 2024 · 07ec95b · 07ec95b
1 parent 1097ba8
commit 07ec95b
Show file tree

Hide file tree

Showing 3 changed files with 561 additions and 4 deletions.
diff --git a/session/session.go b/session/session.go
@@ -1394,10 +1394,6 @@ func createSessionFunc(store kv.Storage) pools.Factory {
 		if err != nil {
 			return nil, errors.Trace(err)
 		}
-		err = se.sessionVars.SetSystemVar(variable.TiDBEnableWindowFunction, variable.BoolToOnOff(variable.DefEnableWindowFunction))
-		if err != nil {
-			return nil, errors.Trace(err)
-		}
 		err = se.sessionVars.SetSystemVar(variable.TiDBConstraintCheckInPlacePessimistic, variable.On)
 		if err != nil {
 			return nil, errors.Trace(err)

diff --git a/sessionctx/variable/session.go b/sessionctx/variable/session.go
@@ -1726,7 +1726,19 @@ func NewSessionVars(hctx HookContext) *SessionVars {
 		HookContext:                   hctx,
 		EnableReuseCheck:              DefTiDBEnableReusechunk,
 		preUseChunkAlloc:              DefTiDBUseAlloc,
+<<<<<<< HEAD:sessionctx/variable/session.go
 		ChunkPool:                     ReuseChunkPool{Alloc: nil},
+=======
+		chunkPool:                     nil,
+		mppExchangeCompressionMode:    DefaultExchangeCompressionMode,
+		mppVersion:                    kv.MppVersionUnspecified,
+		EnableLateMaterialization:     DefTiDBOptEnableLateMaterialization,
+		TiFlashComputeDispatchPolicy:  tiflashcompute.DispatchPolicyConsistentHash,
+		ResourceGroupName:             resourcegroup.DefaultResourceGroupName,
+		DefaultCollationForUTF8MB4:    mysql.DefaultCollationName,
+		GroupConcatMaxLen:             DefGroupConcatMaxLen,
+		EnableRedactLog:               DefTiDBRedactLog,
+>>>>>>> 2c30f865e32 (session: set EnableWindowFunction for all SessionVars (#55991)):pkg/sessionctx/variable/session.go
 		EnableWindowFunction:          DefEnableWindowFunction,
 	}
 	vars.KVVars = tikvstore.NewVariables(&vars.Killed)