Merge cockroachdb#136130

136130: sql: fix panic catching in SHOW HISTOGRAM r=rytaft a=rytaft This commit fixes an oversight in cockroachdb#135944 where an error from catching a panic in `SHOW HISTOGRAM` was not correctly propagated. Informs cockroachdb#135940 Release note: None Co-authored-by: Rebecca Taft <[email protected]>
sambhav-jain-16 · Nov 26, 2024 · 93371b5 · 93371b5
2 parents bc04a81 + ae52b02
commit 93371b5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/sql/show_histogram.go b/pkg/sql/show_histogram.go
@@ -38,7 +38,7 @@ func (p *planner) ShowHistogram(ctx context.Context, n *tree.ShowHistogram) (pla
 		name:    fmt.Sprintf("SHOW HISTOGRAM %d", n.HistogramID),
 		columns: showHistogramColumns,
 
-		constructor: func(ctx context.Context, p *planner) (planNode, error) {
+		constructor: func(ctx context.Context, p *planner) (_ planNode, err error) {
 			row, err := p.InternalSQLTxn().QueryRowEx(
 				ctx,
 				"read-histogram",