diff --git a/go.mod b/go.mod
index 7ca1fcbe77..4ed38896df 100644
--- a/go.mod
+++ b/go.mod
@@ -6,10 +6,10 @@ require (
 	github.com/PuerkitoBio/goquery v1.8.1
 	github.com/cockroachdb/apd/v3 v3.2.3
 	github.com/cockroachdb/errors v1.7.5
-	github.com/dolthub/dolt/go v0.40.5-0.20260609180312-20cac47c5cf9
+	github.com/dolthub/dolt/go v0.40.5-0.20260611201749-2de22d2c05da
 	github.com/dolthub/eventsapi_schema v0.0.0-20260310172945-37a9265ade69
 	github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
-	github.com/dolthub/go-mysql-server v0.20.1-0.20260608231025-6579b6af9de2
+	github.com/dolthub/go-mysql-server v0.20.1-0.20260610222239-82ca9a426101
 	github.com/dolthub/pg_query_go/v6 v6.0.0-20251215122834-fb20be4254d1
 	github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216
 	github.com/dolthub/vitess v0.0.0-20260604210335-0893abc80542
@@ -105,7 +105,7 @@ require (
 	github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 // indirect
 	github.com/dolthub/dolt-mcp v0.3.4 // indirect
 	github.com/dolthub/fslock v0.0.5 // indirect
-	github.com/dolthub/go-icu-regex v0.0.0-20260412212219-49724d547866 // indirect
+	github.com/dolthub/go-icu-regex v0.0.0-20260610153742-72563bc7ca83 // indirect
 	github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 // indirect
 	github.com/dolthub/ishell v0.0.0-20260414231531-5f031e3e9037 // indirect
 	github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 // indirect
diff --git a/go.sum b/go.sum
index 29b6355aa2..988715ed93 100644
--- a/go.sum
+++ b/go.sum
@@ -246,18 +246,18 @@ github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 h1:I
 github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12/go.mod h1:rN7X8BHwkjPcfMQQ2QTAq/xM3leUSGLfb+1Js7Y6TVo=
 github.com/dolthub/dolt-mcp v0.3.4 h1:AyG5cw+fNWXDHXujtQnqUPZrpWtPg6FN6yYtjv1pP44=
 github.com/dolthub/dolt-mcp v0.3.4/go.mod h1:bCZ7KHvDYs+M0e+ySgmGiNvLhcwsN7bbf5YCyillLrk=
-github.com/dolthub/dolt/go v0.40.5-0.20260609180312-20cac47c5cf9 h1:tDoj5+v3WjAT6Ospy44shBeaOhrbTcEcs6tNRaB4zxw=
-github.com/dolthub/dolt/go v0.40.5-0.20260609180312-20cac47c5cf9/go.mod h1:qUI6QdFuKRbg4/7U+gNrm1dcuH3ZpCSJNgT6GnZ2fTQ=
+github.com/dolthub/dolt/go v0.40.5-0.20260611201749-2de22d2c05da h1:zYDtpzy7/HFxOzr8KHGhBtKfiYmx6g8yYZCgslIPuys=
+github.com/dolthub/dolt/go v0.40.5-0.20260611201749-2de22d2c05da/go.mod h1:6K1zrTpiNo4fyzyZA71LXHCrgt1tWY8QC6aRoCe9WlA=
 github.com/dolthub/eventsapi_schema v0.0.0-20260310172945-37a9265ade69 h1:JShhbqMw26nKx3pqqu/cFxOpzBkN+4elVhzuUfgDw2k=
 github.com/dolthub/eventsapi_schema v0.0.0-20260310172945-37a9265ade69/go.mod h1:SSLraQS/jGLYFgff3vuZ+JbVUct6vyEeMzjLBqWqoyM=
 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1Gms9599cr0REMww=
 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2/go.mod h1:mIEZOHnFx4ZMQeawhw9rhsj+0zwQj7adVsnBX7t+eKY=
 github.com/dolthub/fslock v0.0.5 h1:QoXhBhgY1oumHE26qyE7tgmXUT8qjJwxsIzo54O/B/k=
 github.com/dolthub/fslock v0.0.5/go.mod h1:sdofYYqE0D79zNZyB4/kmlnsQOVap1C2yByjGKSirEM=
-github.com/dolthub/go-icu-regex v0.0.0-20260412212219-49724d547866 h1:U6gSf5I0e6h6GP1/5Sa7D2lWW1CWfcVPtY5wkyHq6jY=
-github.com/dolthub/go-icu-regex v0.0.0-20260412212219-49724d547866/go.mod h1:F3cnm+vMRK1HaU6+rNqQrOCyR03HHhR1GWG2gnPOqaE=
-github.com/dolthub/go-mysql-server v0.20.1-0.20260608231025-6579b6af9de2 h1:xrRFEiifbxFFpRvNVswPFYXxg6UKgaWUW7UmFI+Z7NU=
-github.com/dolthub/go-mysql-server v0.20.1-0.20260608231025-6579b6af9de2/go.mod h1:A3nEC4RgBm9UzuQCGhQhJDQAiFMPsZU3NPKbGhEd8R4=
+github.com/dolthub/go-icu-regex v0.0.0-20260610153742-72563bc7ca83 h1:FEMjCGEroDnY/BXyAffVZxUpXhP2GpoUJyyq5KaLn8c=
+github.com/dolthub/go-icu-regex v0.0.0-20260610153742-72563bc7ca83/go.mod h1:F3cnm+vMRK1HaU6+rNqQrOCyR03HHhR1GWG2gnPOqaE=
+github.com/dolthub/go-mysql-server v0.20.1-0.20260610222239-82ca9a426101 h1:Abci4YqSTb0jRO7H/BGljkSJ0hkAZvZlim74JLAWros=
+github.com/dolthub/go-mysql-server v0.20.1-0.20260610222239-82ca9a426101/go.mod h1:xrwqyZnkLeqNm/LNp57NB+otApMXv1UJohn9dSkbgR0=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q=
 github.com/dolthub/ishell v0.0.0-20260414231531-5f031e3e9037 h1:oIW9HwuWrhxv+4HZxA+QQSKHLqWFyXZ2FmNjUYwkdiM=
diff --git a/server/tables/pgcatalog/pg_constraint.go b/server/tables/pgcatalog/pg_constraint.go
index 17d3dad3d1..a9b2bd7d48 100644
--- a/server/tables/pgcatalog/pg_constraint.go
+++ b/server/tables/pgcatalog/pg_constraint.go
@@ -278,11 +278,11 @@ func (p PgConstraintHandler) getIndexScanRange(rng sql.Range, index sql.Index) (
 			if typOidUpperSet {
 				if nameUpperSet {
 					nameUpper = fmt.Sprintf("%s%o", nameUpper, rune(0))
-				} else {
+				} else if typOidUpper < math.MaxUint32 { // prevent overflow
 					typOidUpper = typOidUpper + 1
 				}
 			} else {
-				if !relOidUpperSet {
+				if !relOidUpperSet && relOidUpper < math.MaxUint32 { // prevent overflow
 					relOidUpper = relOidUpper + 1
 				}
 			}
diff --git a/testing/go/index_test.go b/testing/go/index_test.go
index e5e7c48064..f09445191b 100644
--- a/testing/go/index_test.go
+++ b/testing/go/index_test.go
@@ -198,7 +198,7 @@ func TestBasicIndexing(t *testing.T) {
 						{"Sort(test.pk ASC)"},
 						{" └─ IndexedTableAccess(test)"},
 						{"     ├─ index: [test.pk,test.v1]"},
-						{"     ├─ filters: [{[NULL, ∞), (NULL, f)}, {[NULL, ∞), (t, ∞)}]"},
+						{"     ├─ filters: [{(NULL, ∞), (NULL, f)}, {(NULL, ∞), (t, ∞)}]"},
 						{"     └─ columns: [pk v1]"},
 					},
 				},
@@ -288,7 +288,7 @@ func TestBasicIndexing(t *testing.T) {
 						{" ├─ (test.v1 = jointable.v3 AND test.v2 = 22)"},
 						{" ├─ IndexedTableAccess(test)"},
 						{" │   ├─ index: [test.pk]"},
-						{" │   ├─ filters: [{[NULL, ∞)}]"},
+						{" │   ├─ filters: [{(NULL, ∞)}]"},
 						{" │   └─ columns: [pk v1 v2]"},
 						{" └─ Table"},
 						{"     ├─ name: jointable"},
@@ -308,7 +308,7 @@ func TestBasicIndexing(t *testing.T) {
 						{" ├─ (test.v1 = jointable.v3 AND test.v2 = jointable.v4)"},
 						{" ├─ IndexedTableAccess(test)"},
 						{" │   ├─ index: [test.pk]"},
-						{" │   ├─ filters: [{[NULL, ∞)}]"},
+						{" │   ├─ filters: [{(NULL, ∞)}]"},
 						{" │   └─ columns: [pk v1 v2]"},
 						{" └─ Table"},
 						{"     ├─ name: jointable"},
@@ -462,7 +462,7 @@ func TestBasicIndexing(t *testing.T) {
 						{" ├─ (test.v1 = jointable.v3 AND test.v2 = 22)"},
 						{" ├─ IndexedTableAccess(test)"},
 						{" │   ├─ index: [test.pk]"},
-						{" │   ├─ filters: [{[NULL, ∞)}]"},
+						{" │   ├─ filters: [{(NULL, ∞)}]"},
 						{" │   └─ columns: [pk v1 v2]"},
 						{" └─ Table"},
 						{"     ├─ name: jointable"},
@@ -496,7 +496,7 @@ func TestBasicIndexing(t *testing.T) {
 						{" ├─ (test.v1 = sq.v3 AND test.v2 = sq.v4)"},
 						{" ├─ IndexedTableAccess(test)"},
 						{" │   ├─ index: [test.pk]"},
-						{" │   ├─ filters: [{[NULL, ∞)}]"},
+						{" │   ├─ filters: [{(NULL, ∞)}]"},
 						{" │   └─ columns: [pk v1 v2]"},
 						{" └─ TableAlias(sq)"},
 						{"     └─ Table"},