Skip to content

[no-release-notes] Remove setting @@port in Dolt #9686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
angelamayxie merged 9 commits into from
Aug 14, 2025
Merged

[no-release-notes] Remove setting @@port in Dolt #9686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
002778c
remove setting port in dolt
angelamayxie Aug 14, 2025
81112cd
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/upda…
angelamayxie Aug 14, 2025
bbcc73c
set persisted sys vars after initiating gms
angelamayxie Aug 14, 2025
c75a040
Merge branch 'angela/port_cleanup' of https://github.com/dolthub/dolt…
angelamayxie Aug 14, 2025
630f8d7
gms bump
angelamayxie Aug 14, 2025
ec0974d
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/upda…
angelamayxie Aug 14, 2025
4fb1dab
[ga-bump-dep] Bump dependency in Dolt by angelamayxie
angelamayxie Aug 14, 2025
7c60ec4
Merge branch 'angela/port_cleanup' into angelamayxie-6bf02c23
angelamayxie Aug 14, 2025
d9cd28c
Merge pull request #9689 from dolthub/angelamayxie-6bf02c23
angelamayxie Aug 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions go/cmd/dolt/commands/sqlserver/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,17 +230,6 @@ func ConfigureServices(
}
controller.Register(LoadServerConfig)

// Ensure @@port reflects the configured server port instead of the MySQL default (3306)
SetPortSystemVariable := &svcs.AnonService{
InitF: func(context.Context) error {
if err := sql.SystemVariables.AssignValues(map[string]interface{}{"port": cfg.ServerConfig.Port()}); err != nil {
logrus.Warnf("unable to set @@port system variable: %v", err)
}
return nil
},
}
controller.Register(SetPortSystemVariable)

// Create SQL Engine with users
var config *engine.SqlEngineConfig
InitSqlEngineConfig := &svcs.AnonService{
Expand Down
4 changes: 2 additions & 2 deletions go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
github.com/dolthub/fslock v0.0.3
github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
github.com/dolthub/vitess v0.0.0-20250813175212-45844169a751
github.com/dolthub/vitess v0.0.0-20250814204310-c749d213f235
github.com/dustin/go-humanize v1.0.1
github.com/fatih/color v1.13.0
github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568
Expand Down Expand Up @@ -60,7 +60,7 @@ require (
github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12
github.com/dolthub/eventsapi_schema v0.0.0-20250725194025-a087efa1ee55
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
github.com/dolthub/go-mysql-server v0.20.1-0.20250814001813-6d94caa6c961
github.com/dolthub/go-mysql-server v0.20.1-0.20250814222555-6bf02c239039
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63
github.com/edsrzf/mmap-go v1.2.0
github.com/esote/minmaxheap v1.0.0
Expand Down
8 changes: 4 additions & 4 deletions go/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,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-20250327004329-6799764f2dad h1:66ZPawHszNu37VPQckdhX1BPPVzREsGgNxQeefnlm3g=
github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA=
github.com/dolthub/go-mysql-server v0.20.1-0.20250814001813-6d94caa6c961 h1:MEMt7wxoGt/2GNFbFNTVNK3shBZDyeRajelR3DY4BPg=
github.com/dolthub/go-mysql-server v0.20.1-0.20250814001813-6d94caa6c961/go.mod h1:nR895qqNcXnySptw6EPmGsUE0fxQA+WIsCtQeXYJe58=
github.com/dolthub/go-mysql-server v0.20.1-0.20250814222555-6bf02c239039 h1:KYoTzsDZI1diB50r3xI3He2EKMZ/HFa2rBZChLIV9II=
github.com/dolthub/go-mysql-server v0.20.1-0.20250814222555-6bf02c239039/go.mod h1:J+ixF8s/kL8x8W8sQh4UNmufcyFOeIi/FPo+MwAjUcU=
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=
Expand All @@ -223,8 +223,8 @@ github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTE
github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI=
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9XGFa6q5Ap4Z/OhNkAMBaK5YeuEzwJt+NZdhiE=
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY=
github.com/dolthub/vitess v0.0.0-20250813175212-45844169a751 h1:BBQKyvyODewdQxS+ICklMn1d/fFj2pVlkmMN1QFY4ms=
github.com/dolthub/vitess v0.0.0-20250813175212-45844169a751/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
github.com/dolthub/vitess v0.0.0-20250814204310-c749d213f235 h1:uXrK+xn8rCwz/8jWDKaDyqZG1HbZI9F4V4HJ7zXFPMY=
github.com/dolthub/vitess v0.0.0-20250814204310-c749d213f235/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
github.com/edsrzf/mmap-go v1.2.0 h1:hXLYlkbaPzt1SaQk+anYwKSRNhufIDCchSPkUD6dD84=
Expand Down
Loading