resolve conflicts

pingcap · Jan 12, 2023 · 57a0a00 · 57a0a00
1 parent cfb6246
commit 57a0a00
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/executor/executor.go b/executor/executor.go
@@ -2168,12 +2168,8 @@ func ResetContextOfStmt(ctx sessionctx.Context, s ast.StmtNode) (err error) {
 	vars.ClearStmtVars()
 	vars.PrevFoundInBinding = vars.FoundInBinding
 	vars.FoundInBinding = false
-<<<<<<< HEAD
-=======
-	vars.DurationWaitTS = 0
 	vars.CurrInsertBatchExtraCols = nil
 	vars.CurrInsertValues = chunk.Row{}
->>>>>>> f600fc694f (executor: reset the related session vars for both INSERT and REPLACE (#40354))
 	return
 }