fix git conflict

Signed-off-by: lance6716 <lance6716@gmail.com>
pingcap · Jun 30, 2023 · 204879f · 204879f
1 parent 330af49
commit 204879f
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/tidb-server/main.go b/tidb-server/main.go
@@ -612,18 +612,8 @@ func setGlobalVars() {
 	}
 	plannercore.AllowCartesianProduct.Store(cfg.Performance.CrossJoin)
 	privileges.SkipWithGrant = cfg.Security.SkipGrantTable
-<<<<<<< HEAD
 	kv.TxnTotalSizeLimit = cfg.Performance.TxnTotalSizeLimit
-	if cfg.Performance.TxnEntrySizeLimit > 120*1024*1024 {
-=======
-	if cfg.Performance.TxnTotalSizeLimit == config.DefTxnTotalSizeLimit {
-		// practically deprecate the config, let the new session memory tracker take charge of it.
-		kv.TxnTotalSizeLimit = config.SuperLargeTxnSize
-	} else {
-		kv.TxnTotalSizeLimit = cfg.Performance.TxnTotalSizeLimit
-	}
 	if cfg.Performance.TxnEntrySizeLimit > config.MaxTxnEntrySizeLimit {
->>>>>>> bb2e845f712 (lightning: fix risk of OOM (#40443) (#44333))
 		log.Fatal("cannot set txn entry size limit larger than 120M")
 	}
 	kv.TxnEntrySizeLimit = cfg.Performance.TxnEntrySizeLimit