sql: make CREATE STATISTICS work properly with EXPLAIN ANALYZE (DEBUG)

With this change, the bundle now contains the diagram for the
underlying plan.

Release note: None

pkg/sql/instrumentation.go

@@ -258,6 +258,13 @@ func (ih *instrumentationHelper) ShouldCollectBundle() bool {
 	return ih.collectBundle
 }
 
+// ShouldInlineCreateStatsJob is true if we are running a statement under
+// EXPLAIN ANALYZE, in which case we want to run any CREATE STATISTICS plan
+// directly (and not through a job).
+func (ih *instrumentationHelper) ShouldInlineCreateStatsJob() bool {
+	return ih.outputMode == explainAnalyzePlanOutput || ih.outputMode == explainAnalyzeDebugOutput
+}
+
 // ShouldBuildExplainPlan returns true if we should build an explain plan and
 // call RecordExplainPlan.
 func (ih *instrumentationHelper) ShouldBuildExplainPlan() bool {

pkg/sql/opt_exec_factory.go

@@ -1857,7 +1857,7 @@ func (ef *execFactory) ConstructCreateStatistics(cs *tree.CreateStats) (exec.Nod
 	}
 	// Don't run as a job if we are inside an EXPLAIN / EXPLAIN ANALYZE. That will
 	// allow us to get insight into the actual execution.
-	runAsJob := !ef.isExplain
+	runAsJob := !ef.isExplain && !ef.planner.instrumentation.ShouldInlineCreateStatsJob()
 
 	return &createStatsNode{
 		CreateStats: *cs,