Merge branch 'master' of https://github.com/seaweedfs/seaweedfs

2 files changed, 5 insertions, 2 deletions

diff --git a/go.mod b/go.mod
index 153ebad0e..6b10f1a4f 100644
--- a/go.mod
+++ b/go.mod
@@ -464,4 +464,7 @@ require (
 	storj.io/uplink v1.13.1 // indirect
 )
 
+// Use the seaweedfs fork of cockroachdb-parser to fix cross-platform build issues
+replace github.com/cockroachdb/cockroachdb-parser => github.com/seaweedfs/cockroachdb-parser v0.0.0-20251021182748-d0c58c67297e
+
 // replace github.com/seaweedfs/raft => /Users/chrislu/go/src/github.com/seaweedfs/raft
diff --git a/go.sum b/go.sum
index db3541d52..0c4b7f531 100644
--- a/go.sum
+++ b/go.sum
@@ -1623,8 +1623,8 @@ github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71e
 github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
 github.com/schollz/progressbar/v3 v3.18.0 h1:uXdoHABRFmNIjUfte/Ex7WtuyVslrw2wVPQmCN62HpA=
 github.com/schollz/progressbar/v3 v3.18.0/go.mod h1:IsO3lpbaGuzh8zIMzgY3+J8l4C8GjO0Y9S69eFvNsec=
-github.com/seaweedfs/cockroachdb-parser v0.0.0-20251021184156-909763b17138 h1:bX1vBF7GQjPeFQsCAZ8gCQGS/nJQnekL7gZ4Qg/pF4E=
-github.com/seaweedfs/cockroachdb-parser v0.0.0-20251021184156-909763b17138/go.mod h1:JSKCh6uCHBz91lQYFYHCyTrSVIPge4SUFVn28iwMNB0=
+github.com/seaweedfs/cockroachdb-parser v0.0.0-20251021182748-d0c58c67297e h1:CDKaiOOEslsh0eARMVDJubE1FoI1IQ57NwpuDvfSJ0s=
+github.com/seaweedfs/cockroachdb-parser v0.0.0-20251021182748-d0c58c67297e/go.mod h1:JSKCh6uCHBz91lQYFYHCyTrSVIPge4SUFVn28iwMNB0=
 github.com/seaweedfs/goexif v1.0.3 h1:ve/OjI7dxPW8X9YQsv3JuVMaxEyF9Rvfd04ouL+Bz30=
 github.com/seaweedfs/goexif v1.0.3/go.mod h1:Oni780Z236sXpIQzk1XoJlTwqrJ02smEin9zQeff7Fk=
 github.com/seaweedfs/raft v1.1.3 h1:5B6hgneQ7IuU4Ceom/f6QUt8pEeqjcsRo+IxlyPZCws=