From ae52b025387bed66603318f1efe3273ebf9bc132 Mon Sep 17 00:00:00 2001
From: Rebecca Taft <becca@cockroachlabs.com>
Date: Mon, 25 Nov 2024 13:24:50 -0600
Subject: [PATCH] sql: fix panic catching in SHOW HISTOGRAM

This commit fixes an oversight in #135944 where an error from
catching a panic in SHOW HISTOGRAM was not correctly propagated.

Informs #135940

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

diff --git a/pkg/sql/show_histogram.go b/pkg/sql/show_histogram.go
index 3a25b4b7cf23..c82b157b90e0 100644
--- 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",