Skip to content

Commit

Permalink
sql: fix panic catching in SHOW HISTOGRAM
Browse files Browse the repository at this point in the history
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
  • Loading branch information
rytaft committed Nov 25, 2024
1 parent 646bf4e commit ae52b02
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/sql/show_histogram.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit ae52b02

Please sign in to comment.