Skip to content
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

Jump to bottom

Auto Detect MySQL Version and Use in vtgate mysql_server_version Flag #10701

Merged
merged 12 commits into from
Jul 18, 2022
Merged

Auto Detect MySQL Version and Use in vtgate mysql_server_version Flag #10701

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fe1e0b8
Auto detect MySQL version and use in vtgate --mysql_server_version flag
mattlord Jul 15, 2022
c5cf717
Remove any explicit static usage of mysql_server_version
mattlord Jul 15, 2022
cbee18a
The reservedconns test needs to override the mysql_server_version
mattlord Jul 15, 2022
b1820df
Explicitly allow overriding the mysql_system_version
mattlord Jul 16, 2022
f143445
minimize diff
mattlord Jul 16, 2022
bbadd17
Fix https://github.com/vitessio/vitess/issues/10712
mattlord Jul 16, 2022
2f1a078
Use more robust string comparisons
mattlord Jul 16, 2022
7a8afcf
Fix collation handling in tests
mattlord Jul 16, 2022
133b471
Fix tm_init_test
mattlord Jul 16, 2022
ef719d6
Fix more unit tests
mattlord Jul 17, 2022
a0d0c38
Another test fix
mattlord Jul 17, 2022
e195cd2
Fix another test that requires 8.0 collations
mattlord Jul 17, 2022
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: 11 additions & 0 deletions go/test/endtoend/cluster/vtgate_process.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"time"

"vitess.io/vitess/go/vt/log"
"vitess.io/vitess/go/vt/mysqlctl"
"vitess.io/vitess/go/vt/vtgate/planbuilder"
"vitess.io/vitess/go/vt/vtgate/planbuilder/plancontext"
)
Expand Down Expand Up @@ -69,6 +70,15 @@ const defaultVtGatePlannerVersion = planbuilder.Gen4CompareV3

// Setup starts Vtgate process with required arguements
func (vtgate *VtgateProcess) Setup() (err error) {
version, err := mysqlctl.GetVersionString()
if err != nil {
return err
}
_, vers, err := mysqlctl.ParseVersionString(version)
if err != nil {
return err
}
mysqlvers := fmt.Sprintf("%d.%d.%d-vitess", vers.Major, vers.Minor, vers.Patch)

args := []string{
"--topo_implementation", vtgate.CommonArg.TopoImplementation,
Expand All @@ -85,6 +95,7 @@ func (vtgate *VtgateProcess) Setup() (err error) {
"--tablet_types_to_wait", vtgate.TabletTypesToWait,
"--service_map", vtgate.ServiceMap,
"--mysql_auth_server_impl", vtgate.MySQLAuthServerImpl,
"--mysql_server_version", mysqlvers,
}
if vtgate.PlannerVersion > 0 {
args = append(args, "--planner-version", vtgate.PlannerVersion.String())
Expand Down