Merge #62584

62584: sql: remove unused error r=yuzefovich a=yuzefovich Release note: None Co-authored-by: Yahor Yuzefovich <[email protected]>
cockroachdb · Mar 26, 2021 · 1c9289e · 1c9289e
2 parents 56ef155 + 1d2fadf
commit 1c9289e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/pkg/sql/distsql_running.go b/pkg/sql/distsql_running.go
@@ -371,7 +371,6 @@ func (dsp *DistSQLPlanner) Run(
 			// We need to close the planNode tree we translated into a DistSQL plan
 			// before flow.Cleanup, which closes memory accounts that expect to be
 			// emptied.
-			curPlan.execErr = recv.resultWriter.Err()
 			curPlan.close(ctx)
 			flow.Cleanup(ctx)
 		}

diff --git a/pkg/sql/plan.go b/pkg/sql/plan.go
@@ -300,9 +300,6 @@ type planTop struct {
 	// flags is populated during planning and execution.
 	flags planFlags
 
-	// execErr retains the last execution error, if any.
-	execErr error
-
 	// avoidBuffering, when set, causes the execution to avoid buffering
 	// results.
 	avoidBuffering bool