This is an automated cherry-pick of pingcap#53985

Signed-off-by: ti-chi-bot <[email protected]>

Author: ekexium

executor/delete.go

@@ -148,13 +148,18 @@ func (e *DeleteExec) deleteSingleTableByChunk(ctx context.Context) error {
 }
 
 func (e *DeleteExec) doBatchDelete(ctx context.Context) error {
+<<<<<<< HEAD:executor/delete.go
 	txn, err := e.ctx.Txn(false)
 	if err != nil {
 		return ErrBatchInsertFail.GenWithStack("BatchDelete failed with error: %v", err)
 	}
 	e.memTracker.Consume(-int64(txn.Size()))
 	e.ctx.StmtCommit()
 	if err := sessiontxn.NewTxnInStmt(ctx, e.ctx); err != nil {
+=======
+	e.Ctx().StmtCommit(ctx)
+	if err := sessiontxn.NewTxnInStmt(ctx, e.Ctx()); err != nil {
+>>>>>>> 9960ae746a3 (executor: do not track membuffer's memory in executor (#53985)):pkg/executor/delete.go
 		// We should return a special error for batch insert.
 		return ErrBatchInsertFail.GenWithStack("BatchDelete failed with error: %v", err)
 	}

executor/insert_common.go

@@ -532,13 +532,18 @@ func insertRowsFromSelect(ctx context.Context, base insertCommon) error {
 }
 
 func (e *InsertValues) doBatchInsert(ctx context.Context) error {
+<<<<<<< HEAD:executor/insert_common.go
 	txn, err := e.ctx.Txn(false)
 	if err != nil {
 		return ErrBatchInsertFail.GenWithStack("BatchInsert failed with error: %v", err)
 	}
 	e.memTracker.Consume(-int64(txn.Size()))
 	e.ctx.StmtCommit()
 	if err := sessiontxn.NewTxnInStmt(ctx, e.ctx); err != nil {
+=======
+	e.Ctx().StmtCommit(ctx)
+	if err := sessiontxn.NewTxnInStmt(ctx, e.Ctx()); err != nil {
+>>>>>>> 9960ae746a3 (executor: do not track membuffer's memory in executor (#53985)):pkg/executor/insert_common.go
 		// We should return a special error for batch insert.
 		return ErrBatchInsertFail.GenWithStack("BatchInsert failed with error: %v", err)
 	}

executor/replace.go

@@ -160,7 +160,6 @@ func (e *ReplaceExec) exec(ctx context.Context, newRows [][]types.Datum) error {
 	if err != nil {
 		return err
 	}
-	txnSize := txn.Size()
 
 	if e.collectRuntimeStatsEnabled() {
 		if snapshot := txn.GetSnapshot(); snapshot != nil {
@@ -186,8 +185,12 @@ func (e *ReplaceExec) exec(ctx context.Context, newRows [][]types.Datum) error {
 			return err
 		}
 	}
+<<<<<<< HEAD:executor/replace.go
 	e.memTracker.Consume(int64(txn.Size() - txnSize))
 	return nil
+=======
+	return txn.MayFlush()
+>>>>>>> 9960ae746a3 (executor: do not track membuffer's memory in executor (#53985)):pkg/executor/replace.go
 }
 
 // Next implements the Executor Next interface.