From a9c9a08b6a1e2e22039cc3b73645c762d267cde5 Mon Sep 17 00:00:00 2001
From: Philip O'Toole <philip.otoole@yahoo.com>
Date: Sat, 20 Jan 2024 13:45:16 -0500
Subject: [PATCH 1/3] Don't stomp on outer error

---
 cmd/rqlite/query.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/cmd/rqlite/query.go b/cmd/rqlite/query.go
index e8534f67..35e9a8db 100644
--- a/cmd/rqlite/query.go
+++ b/cmd/rqlite/query.go
@@ -92,18 +92,17 @@ func queryWithClient(ctx *cli.Context, client *cl.Client, timer bool, consistenc
 		RawQuery: queryStr.Encode(),
 	}
 
-	resp, err := client.Query(u)
-
 	var hcr error
+	resp, err := client.Query(u)
 	if err != nil {
 		// If the error is HostChangedError, it should be propagated back to the caller to handle
 		// accordingly (change prompt display), but we should still assume that the request succeeded on some
 		// host and not treat it as an error.
-		err, ok := err.(*cl.HostChangedError)
+		innerErr, ok := err.(*cl.HostChangedError)
 		if !ok {
 			return err
 		}
-		hcr = err
+		hcr = innerErr
 	}
 
 	response, err := io.ReadAll(resp.Body)

From 6adf164154c349004a6fcef97715a4678a3697d1 Mon Sep 17 00:00:00 2001
From: Philip O'Toole <philip.otoole@yahoo.com>
Date: Sat, 20 Jan 2024 13:46:48 -0500
Subject: [PATCH 2/3] CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df99abcb..d9164b67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 - [PR #1615](https://github.com/rqlite/rqlite/pull/1615): Add extensive WAL checkpoint test at the database level.
 - [PR #1616](https://github.com/rqlite/rqlite/pull/1616): Add time and checksum based change-detection functions to the database level.
 - [PR #1617](https://github.com/rqlite/rqlite/pull/1617): Add VacuumInto to database layer.
+- [PR #1621](https://github.com/rqlite/rqlite/pull/1621): Fix a panic in the rqlite shell by not stomping on an "outer" error.
 
 ## 8.16.7 (January 18th 2024)
 The releases changes the default logging level for the Raft subsystem from `INFO` to `WARN`. This results is less logging by the Raft subsystem. If you prefer the previous `INFO` level of logging, it can be re-enabled via the command line flag `-raft-log-level=INFO`.

From 10a5c9bd0e89e05c61e6de1a012470c432ee3591 Mon Sep 17 00:00:00 2001
From: Philip O'Toole <philip.otoole@yahoo.com>
Date: Sat, 20 Jan 2024 13:52:35 -0500
Subject: [PATCH 3/3] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9164b67..10bb8aec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 8.16.8 (unreleased)
+## 8.16.8 (January 20th 2024)
 ### Implementation changes and bug fixes
 - [PR #1615](https://github.com/rqlite/rqlite/pull/1615): Add extensive WAL checkpoint test at the database level.
 - [PR #1616](https://github.com/rqlite/rqlite/pull/1616): Add time and checksum based change-detection functions to the database level.