From d91e8ca5eacf9b9050f341d6d428849aaf32d204 Mon Sep 17 00:00:00 2001
From: Radu Berinde <radu@cockroachlabs.com>
Date: Tue, 6 Aug 2019 13:45:19 -0400
Subject: [PATCH] opt: turn optimizer on in schema changer

The schema changer sets up a custom `SessionData`; it wasn't
initializing the `OptimizerMode` field. This change sets it to On
(which is normally the default).

Release note: None
---
 pkg/sql/schema_changer.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/sql/schema_changer.go b/pkg/sql/schema_changer.go
index c08db587b879..e993ed5da9e6 100644
--- a/pkg/sql/schema_changer.go
+++ b/pkg/sql/schema_changer.go
@@ -2269,7 +2269,8 @@ func createSchemaChangeEvalCtx(
 		DataConversion: sessiondata.DataConversionConfig{
 			Location: dummyLocation,
 		},
-		User: security.NodeUser,
+		User:          security.NodeUser,
+		OptimizerMode: sessiondata.OptimizerOn,
 	}
 
 	evalCtx := extendedEvalContext{