From 65605fcd0f764620e1a9c3df86dc1ea0748f40a5 Mon Sep 17 00:00:00 2001
From: David Pacheco <dap@oxidecomputer.com>
Date: Fri, 21 Oct 2022 11:46:17 -0700
Subject: [PATCH 1/3] update CockroachDB to v22.1.9

---
 nexus/tests/output/test-explain-output | 2 +-
 test-utils/src/dev/db.rs               | 8 ++++++++
 tools/cockroachdb_version              | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/nexus/tests/output/test-explain-output b/nexus/tests/output/test-explain-output
index 0f06516271..b2e6e55594 100644
--- a/nexus/tests/output/test-explain-output
+++ b/nexus/tests/output/test-explain-output
@@ -3,5 +3,5 @@ vectorized: true
 
 • scan
   missing stats
-  table: test_users@primary
+  table: test_users@test_users_pkey
   spans: [/'00000000-0000-0000-0000-000000000000' - /'00000000-0000-0000-0000-000000000000']
\ No newline at end of file
diff --git a/test-utils/src/dev/db.rs b/test-utils/src/dev/db.rs
index 5c7bad700b..d96fd0b7fe 100644
--- a/test-utils/src/dev/db.rs
+++ b/test-utils/src/dev/db.rs
@@ -586,6 +586,14 @@ pub async fn check_db_version() -> Result<(), CockroachStartError> {
         })?;
     let version_str = version_str.trim();
 
+    // It's okay if the version found differs only by having the "-dirty"
+    // suffix.  This check is really for catching major version mismatches.
+    let version_str = if let Some(clean) = version_str.strip_suffix("-dirty") {
+        clean
+    } else {
+        version_str
+    };
+
     if version_str != COCKROACHDB_VERSION.trim() {
         return Err(CockroachStartError::BadVersion {
             found: Ok(version_str.to_string()),
diff --git a/tools/cockroachdb_version b/tools/cockroachdb_version
index d44d5b1b7c..4e11c6a7da 100644
--- a/tools/cockroachdb_version
+++ b/tools/cockroachdb_version
@@ -1 +1 @@
-v21.2.9
+v22.1.9

From e9ea04d8237d8ea8bdb1d59b636ba8cae8cc177d Mon Sep 17 00:00:00 2001
From: David Pacheco <dap@oxidecomputer.com>
Date: Fri, 21 Oct 2022 11:52:09 -0700
Subject: [PATCH 2/3] update checksums for Mac and Linux

---
 tools/cockroachdb_checksums | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/cockroachdb_checksums b/tools/cockroachdb_checksums
index 4f8edae3ba..55a502c104 100644
--- a/tools/cockroachdb_checksums
+++ b/tools/cockroachdb_checksums
@@ -1,3 +1,3 @@
-CIDL_MD5_DARWIN="1074a0946f57b65331a3a5723e068645"
-CIDL_MD5_LINUX="50348e9a4e48d4a6ef973650a9edf09d"
+CIDL_MD5_DARWIN="2db972c254b4e3b599e12110520178b5"
+CIDL_MD5_LINUX="8c3170883e0a0be1a34b44090c067a8c"
 CIDL_MD5_ILLUMOS="7efc03b988983e3f1829814c48553822"

From 143f343a0f81f5c2083514680806454e37c1fee0 Mon Sep 17 00:00:00 2001
From: David Pacheco <dap@oxidecomputer.com>
Date: Wed, 26 Oct 2022 15:45:17 -0700
Subject: [PATCH 3/3] update illumos checksum

---
 tools/cockroachdb_checksums | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cockroachdb_checksums b/tools/cockroachdb_checksums
index 55a502c104..50e873100f 100644
--- a/tools/cockroachdb_checksums
+++ b/tools/cockroachdb_checksums
@@ -1,3 +1,3 @@
 CIDL_MD5_DARWIN="2db972c254b4e3b599e12110520178b5"
 CIDL_MD5_LINUX="8c3170883e0a0be1a34b44090c067a8c"
-CIDL_MD5_ILLUMOS="7efc03b988983e3f1829814c48553822"
+CIDL_MD5_ILLUMOS="d8999aff364e5d70f226e139fda724a3"