diff --git a/go.mod b/go.mod
index 7f909dc000..65fea24837 100644
--- a/go.mod
+++ b/go.mod
@@ -8,11 +8,11 @@ require (
 	github.com/PuerkitoBio/goquery v1.8.1
 	github.com/cockroachdb/apd/v2 v2.0.3-0.20200518165714-d020e156310a
 	github.com/cockroachdb/errors v1.7.5
-	github.com/dolthub/dolt/go v0.40.5-0.20241101230052-8a4bc402e910
+	github.com/dolthub/dolt/go v0.40.5-0.20241102040242-530b5771ea74
 	github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20240827111219-e4bb9ca3442d
 	github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
 	github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662
-	github.com/dolthub/go-mysql-server v0.18.2-0.20241101222639-f3be1d272253
+	github.com/dolthub/go-mysql-server v0.18.2-0.20241101230148-2766041c6e96
 	github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216
 	github.com/dolthub/vitess v0.0.0-20241028204000-267861bc75a0
 	github.com/fatih/color v1.13.0
diff --git a/go.sum b/go.sum
index df93cd4f88..5cb97e406e 100644
--- a/go.sum
+++ b/go.sum
@@ -214,8 +214,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/dolthub/dolt/go v0.40.5-0.20241101230052-8a4bc402e910 h1:Gvk2mbFX8L0jNICiqd6hnWwu0ausvpDdthkAhyVBwBg=
-github.com/dolthub/dolt/go v0.40.5-0.20241101230052-8a4bc402e910/go.mod h1:n3oATksx3xfHtT9xUdO7B+j1rEw5jFv4E8DOM6jZHmc=
+github.com/dolthub/dolt/go v0.40.5-0.20241102040242-530b5771ea74 h1:Yv/fLhDt22lLJQ3VW4iXcg3CUWG0fhAMPR/qn/PNwck=
+github.com/dolthub/dolt/go v0.40.5-0.20241102040242-530b5771ea74/go.mod h1:NecH5h4tFar7J3VcALwVnOzf7ILMKAAIdp5kFlT5w/I=
 github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20240827111219-e4bb9ca3442d h1:RZkQeYOrDrOWzCxaP2ttkvg4E2TM9n8lnEsIBLKjqkM=
 github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20240827111219-e4bb9ca3442d/go.mod h1:L5RDYZbC9BBWmoU2+TjTekeqqhFXX5EqH9ln00O0stY=
 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1Gms9599cr0REMww=
@@ -224,8 +224,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
 github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
 github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662 h1:aC17hZD6iwzBwwfO5M+3oBT5E5gGRiQPdn+vzpDXqIA=
 github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168=
-github.com/dolthub/go-mysql-server v0.18.2-0.20241101222639-f3be1d272253 h1:DnEwYi4IiIm+apOy0L9XTOlOIdaoY9jiayhPwHPY7lE=
-github.com/dolthub/go-mysql-server v0.18.2-0.20241101222639-f3be1d272253/go.mod h1:jlzVUA+tsjDw6YKbhRsCLHT3OVO6nn4BWrUanECTo3s=
+github.com/dolthub/go-mysql-server v0.18.2-0.20241101230148-2766041c6e96 h1:pL21juk8jiM0qyvhjncyhC0UvNCspFlqiE9ETYmeVtc=
+github.com/dolthub/go-mysql-server v0.18.2-0.20241101230148-2766041c6e96/go.mod h1:jlzVUA+tsjDw6YKbhRsCLHT3OVO6nn4BWrUanECTo3s=
 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-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE=
diff --git a/server/analyzer/domain.go b/server/analyzer/domain.go
index 6db3c91df4..3080821c70 100644
--- a/server/analyzer/domain.go
+++ b/server/analyzer/domain.go
@@ -93,7 +93,7 @@ func getDefault(ctx *sql.Context, a *analyzer.Analyzer, defExpr, tblName string,
 	if !ok {
 		return nil, sql.ErrInvalidColumnDefaultValue.New(defExpr)
 	}
-	builder := planbuilder.New(ctx, a.Catalog, sql.GlobalParser)
+	builder := planbuilder.New(ctx, a.Catalog, nil, sql.GlobalParser)
 	return builder.BuildColumnDefaultValueWithTable(ae.Expr, selectStmt.From[0], typ, nullable), nil
 }
 
@@ -115,7 +115,7 @@ func getCheckConstraints(ctx *sql.Context, a *analyzer.Analyzer, colName string,
 			return nil, sql.ErrInvalidCheckConstraint.New(check.CheckExpression)
 		}
 
-		builder := planbuilder.New(ctx, a.Catalog, sql.GlobalParser)
+		builder := planbuilder.New(ctx, a.Catalog, nil, sql.GlobalParser)
 		checks[i] = &sql.CheckConstraint{
 			Name:     check.Name,
 			Expr:     builder.BuildScalarWithTable(ae.Expr, selectStmt.From[0]),
diff --git a/testing/go/enginetest/doltgres_harness_test.go b/testing/go/enginetest/doltgres_harness_test.go
index 38d890f72c..b91d03e122 100644
--- a/testing/go/enginetest/doltgres_harness_test.go
+++ b/testing/go/enginetest/doltgres_harness_test.go
@@ -798,6 +798,10 @@ func (d *DoltgresQueryEngine) EngineAnalyzer() *analyzer.Analyzer {
 	}
 }
 
+func (d *DoltgresQueryEngine) EngineEventScheduler() sql.EventScheduler {
+	return nil
+}
+
 func (d *DoltgresQueryEngine) EnginePreparedDataCache() *gms.PreparedDataCache {
 	panic("implement me")
 }