Update session.go

pingcap · May 19, 2021 · fd162af · fd162af
1 parent 4abeb90
commit fd162af
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/session/session.go b/session/session.go
@@ -2221,7 +2221,7 @@ var builtinGlobalVariable = []string{
 	variable.TiDBEnableRateLimitAction,
 	variable.TiDBMemoryUsageAlarmRatio,
 	variable.TiDBMultiStatementMode,
-<<<<<<< HEAD
+	variable.TiDBDMLBatchSize,
 }
 
 var (
@@ -2237,13 +2237,6 @@ func initLoadCommonGlobalVarsSQL() {
 		}
 		loadCommonGlobalVarsSQL = "select HIGH_PRIORITY * from mysql.global_variables where variable_name in ('" + strings.Join(vars, quoteCommaQuote) + "')"
 	})
-=======
-	variable.TiDBEnableExchangePartition,
-	variable.TiDBAllowFallbackToTiKV,
-	variable.TiDBEnableDynamicPrivileges,
-	variable.CTEMaxRecursionDepth,
-	variable.TiDBDMLBatchSize,
->>>>>>> 44830b917... session: fix dml_batch_size doesn't load the global variable (#24710)
 }
 
 // loadCommonGlobalVariablesIfNeeded loads and applies commonly used global variables for the session.