diff --git a/pkg/sql/conn_executor.go b/pkg/sql/conn_executor.go
index e58d459bf902..9f5267f07cd5 100644
--- a/pkg/sql/conn_executor.go
+++ b/pkg/sql/conn_executor.go
@@ -709,7 +709,17 @@ func (s *Server) SetupConn(
 	sdMutIterator := s.makeSessionDataMutatorIterator(sds, args.SessionDefaults)
 	sdMutIterator.onDefaultIntSizeChange = onDefaultIntSizeChange
 	if err := sdMutIterator.applyOnEachMutatorError(func(m sessionDataMutator) error {
-		return resetSessionVars(ctx, m)
+		for varName, v := range varGen {
+			if v.Set != nil {
+				hasDefault, defVal := getSessionVarDefaultString(varName, v, m.sessionDataMutatorBase)
+				if hasDefault {
+					if err := v.Set(ctx, m, defVal); err != nil {
+						return err
+					}
+				}
+			}
+		}
+		return nil
 	}); err != nil {
 		log.Errorf(ctx, "error setting up client session: %s", err)
 		return ConnectionHandler{}, err
diff --git a/pkg/sql/copyshim.go b/pkg/sql/copyshim.go
index 1e090d4a8c0b..7c9d0a1e79eb 100644
--- a/pkg/sql/copyshim.go
+++ b/pkg/sql/copyshim.go
@@ -110,9 +110,7 @@ func RunCopyFrom(
 	)
 	// TODO(cucaroach): I believe newInternalPlanner should do this but doing it
 	// there causes lots of session diffs and test failures and is risky.
-	if err := p.sessionDataMutatorIterator.applyOnEachMutatorError(func(m sessionDataMutator) error {
-		return resetSessionVars(ctx, m)
-	}); err != nil {
+	if err := p.resetAllSessionVars(ctx); err != nil {
 		return -1, err
 	}
 	defer cleanup()
diff --git a/pkg/sql/discard.go b/pkg/sql/discard.go
index d6227dea2a04..b1ddf6504330 100644
--- a/pkg/sql/discard.go
+++ b/pkg/sql/discard.go
@@ -40,12 +40,13 @@ func (n *discardNode) startExec(params runParams) error {
 				"DISCARD ALL cannot run inside a transaction block")
 		}
 
+		// SET SESSION AUTHORIZATION DEFAULT
+		if err := params.p.setRole(params.ctx, false /* local */, params.p.SessionData().SessionUser()); err != nil {
+			return err
+		}
+
 		// RESET ALL
-		if err := params.p.sessionDataMutatorIterator.applyOnEachMutatorError(
-			func(m sessionDataMutator) error {
-				return resetSessionVars(params.ctx, m)
-			},
-		); err != nil {
+		if err := params.p.resetAllSessionVars(params.ctx); err != nil {
 			return err
 		}
 
@@ -56,25 +57,3 @@ func (n *discardNode) startExec(params runParams) error {
 	}
 	return nil
 }
-
-func resetSessionVars(ctx context.Context, m sessionDataMutator) error {
-	for _, varName := range varNames {
-		if err := resetSessionVar(ctx, m, varName); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func resetSessionVar(ctx context.Context, m sessionDataMutator, varName string) error {
-	v := varGen[varName]
-	if v.Set != nil {
-		hasDefault, defVal := getSessionVarDefaultString(varName, v, m.sessionDataMutatorBase)
-		if hasDefault {
-			if err := v.Set(ctx, m, defVal); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
diff --git a/pkg/sql/set_var.go b/pkg/sql/set_var.go
index 7053eef4ae8b..8a1de41ca01b 100644
--- a/pkg/sql/set_var.go
+++ b/pkg/sql/set_var.go
@@ -200,7 +200,7 @@ func (n *setVarNode) Next(_ runParams) (bool, error) { return false, nil }
 func (n *setVarNode) Values() tree.Datums            { return nil }
 func (n *setVarNode) Close(_ context.Context)        {}
 
-func (n *resetAllNode) startExec(params runParams) error {
+func (p *planner) resetAllSessionVars(ctx context.Context) error {
 	for varName, v := range varGen {
 		if v.Set == nil && v.RuntimeSet == nil && v.SetWithPlanner == nil {
 			continue
@@ -212,16 +212,16 @@ func (n *resetAllNode) startExec(params runParams) error {
 		hasDefault, defVal := getSessionVarDefaultString(
 			varName,
 			v,
-			params.p.sessionDataMutatorIterator.sessionDataMutatorBase,
+			p.sessionDataMutatorIterator.sessionDataMutatorBase,
 		)
 		if !hasDefault {
 			continue
 		}
-		if err := params.p.SetSessionVar(params.ctx, varName, defVal, false /* isLocal */); err != nil {
+		if err := p.SetSessionVar(ctx, varName, defVal, false /* isLocal */); err != nil {
 			return err
 		}
 	}
-	for varName := range params.SessionData().CustomOptions {
+	for varName := range p.SessionData().CustomOptions {
 		_, v, err := getSessionVar(varName, false /* missingOK */)
 		if err != nil {
 			return err
@@ -229,15 +229,19 @@ func (n *resetAllNode) startExec(params runParams) error {
 		_, defVal := getSessionVarDefaultString(
 			varName,
 			v,
-			params.p.sessionDataMutatorIterator.sessionDataMutatorBase,
+			p.sessionDataMutatorIterator.sessionDataMutatorBase,
 		)
-		if err := params.p.SetSessionVar(params.ctx, varName, defVal, false /* isLocal */); err != nil {
+		if err := p.SetSessionVar(ctx, varName, defVal, false /* isLocal */); err != nil {
 			return err
 		}
 	}
 	return nil
 }
 
+func (n *resetAllNode) startExec(params runParams) error {
+	return params.p.resetAllSessionVars(params.ctx)
+}
+
 func (n *resetAllNode) Next(_ runParams) (bool, error) { return false, nil }
 func (n *resetAllNode) Values() tree.Datums            { return nil }
 func (n *resetAllNode) Close(_ context.Context)        {}