Skip to content

backport https://github.com/vitessio/vitess/pull/16574 #185

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

Closed
kamil-gwozdz wants to merge 2 commits into from
Closed

backport https://github.com/vitessio/vitess/pull/16574 #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6be549c
allow innodb_lock_wait_timeout as system variable (#16574)
harshit-gangal Aug 12, 2024
51357ad
go mod tidy
kamil-gwozdz Aug 20, 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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ require (
github.com/planetscale/pargzip v0.0.0-20201116224723-90c7fc03ea8a
github.com/planetscale/vtprotobuf v0.5.0
github.com/prometheus/client_golang v1.19.0
github.com/prometheus/common v0.49.0
github.com/prometheus/common v0.49.0 // indirect
Copy link

Copilot AI Aug 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding an // indirect comment to an existing dependency without actually making it indirect could be misleading. This change appears unrelated to the PR's purpose of backporting innodb_lock_wait_timeout functionality.

Suggested change
github.com/prometheus/common v0.49.0 // indirect
github.com/prometheus/common v0.49.0

Copilot uses AI. Check for mistakes.
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
github.com/sjmudd/stopwatch v0.1.1
github.com/soheilhy/cmux v0.1.5
Expand Down
32 changes: 32 additions & 0 deletions go/test/endtoend/vtgate/reservedconn/sysvar_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,3 +459,35 @@ func TestSysVarTxIsolation(t *testing.T) {
// second run, to ensuring the setting is applied on the session and not just on next query after settings.
utils.AssertContains(t, conn, "select @@transaction_isolation, connection_id()", `SERIALIZABLE`)
}

// TestSysVarInnodbWaitTimeout tests the innodb_lock_wait_timeout system variable
func TestSysVarInnodbWaitTimeout(t *testing.T) {
conn, err := mysql.Connect(context.Background(), &vtParams)
require.NoError(t, err)
defer conn.Close()

// default from mysql
utils.AssertMatches(t, conn, "select @@innodb_lock_wait_timeout", `[[UINT64(20)]]`)
utils.AssertMatches(t, conn, "select @@global.innodb_lock_wait_timeout", `[[UINT64(20)]]`)
// ensuring it goes to mysql
utils.AssertContains(t, conn, "select @@innodb_lock_wait_timeout", `UINT64(20)`)
utils.AssertContains(t, conn, "select @@global.innodb_lock_wait_timeout", `UINT64(20)`)

// setting to different value.
utils.Exec(t, conn, "set @@innodb_lock_wait_timeout = 120")
utils.AssertMatches(t, conn, "select @@innodb_lock_wait_timeout", `[[INT64(120)]]`)
// ensuring it goes to mysql
utils.AssertContains(t, conn, "select @@global.innodb_lock_wait_timeout, connection_id()", `UINT64(20)`)
utils.AssertContains(t, conn, "select @@innodb_lock_wait_timeout, connection_id()", `INT64(120)`)
// second run, to ensuring the setting is applied on the session and not just on next query after settings.
utils.AssertContains(t, conn, "select @@innodb_lock_wait_timeout, connection_id()", `INT64(120)`)

// changing setting to different value.
utils.Exec(t, conn, "set @@innodb_lock_wait_timeout = 240")
utils.AssertMatches(t, conn, "select @@innodb_lock_wait_timeout", `[[INT64(240)]]`)
// ensuring it goes to mysql
utils.AssertContains(t, conn, "select @@global.innodb_lock_wait_timeout, connection_id()", `UINT64(20)`)
utils.AssertContains(t, conn, "select @@innodb_lock_wait_timeout, connection_id()", `INT64(240)`)
// second run, to ensuring the setting is applied on the session and not just on next query after settings.
utils.AssertContains(t, conn, "select @@innodb_lock_wait_timeout, connection_id()", `INT64(240)`)
}
4 changes: 3 additions & 1 deletion go/vt/sqlparser/ast_rewriting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,10 +301,12 @@ func (er *astRewriter) rewriteVariable(cursor *Cursor, node *Variable) {
if v, isSet := cursor.Parent().(*SetExpr); isSet && v.Var == node {
return
}
// no rewriting for global scope variable.
// this should be returned from the underlying database.
switch node.Scope {
case VariableScope:
er.udvRewrite(cursor, node)
case GlobalScope, SessionScope, NextTxScope:
case SessionScope, NextTxScope:
er.sysVarRewrite(cursor, node)
}
}
Expand Down
2 changes: 1 addition & 1 deletion go/vt/sysvars/sysvars.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ var (
{Name: ForeignKeyChecks, IsBoolean: true, SupportSetVar: true},
{Name: "group_concat_max_len", SupportSetVar: true},
{Name: "information_schema_stats_expiry"},
{Name: "innodb_lock_wait_timeout"},
{Name: "max_heap_table_size", SupportSetVar: true},
{Name: "max_seeks_for_key", SupportSetVar: true},
{Name: "max_tmp_tables"},
Expand Down Expand Up @@ -246,7 +247,6 @@ var (
{Name: "collation_server"},
{Name: "completion_type"},
{Name: "div_precision_increment", SupportSetVar: true},
{Name: "innodb_lock_wait_timeout"},
{Name: "interactive_timeout"},
{Name: "lc_time_names"},
{Name: "lock_wait_timeout", SupportSetVar: true},
Expand Down
47 changes: 47 additions & 0 deletions go/vt/vtgate/executor_select_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4394,3 +4394,50 @@ func TestStreamJoinQuery(t *testing.T) {
utils.MustMatch(t, wantResult.Rows[idx], result.Rows[idx], "mismatched on: ", strconv.Itoa(idx))
}
}

// TestSysVarGlobalAndSession tests that global and session variables are set correctly.
// It also tests that setting a global variable does not affect the session variable and vice versa.
// Also, test what happens on running select @@global and select @@session for a system variable.
func TestSysVarGlobalAndSession(t *testing.T) {
executor, sbc1, _, _, _ := createExecutorEnv(t)
executor.normalize = true
session := NewAutocommitSession(&vtgatepb.Session{EnableSystemSettings: true, SystemVariables: map[string]string{}})

sbc1.SetResults([]*sqltypes.Result{
sqltypes.MakeTestResult(sqltypes.MakeTestFields("innodb_lock_wait_timeout", "uint64"), "20"),
sqltypes.MakeTestResult(sqltypes.MakeTestFields("innodb_lock_wait_timeout", "uint64"), "20"),
sqltypes.MakeTestResult(sqltypes.MakeTestFields("1", "int64")),
sqltypes.MakeTestResult(sqltypes.MakeTestFields("new", "uint64"), "40"),
sqltypes.MakeTestResult(sqltypes.MakeTestFields("reserve_execute", "uint64")),
sqltypes.MakeTestResult(sqltypes.MakeTestFields("@@global.innodb_lock_wait_timeout", "uint64"), "20"),
})
qr, err := executor.Execute(context.Background(), nil, "TestSetStmt", session,
"select @@innodb_lock_wait_timeout", nil)
require.NoError(t, err)
require.Equal(t, `[[UINT64(20)]]`, fmt.Sprintf("%v", qr.Rows))

qr, err = executor.Execute(context.Background(), nil, "TestSetStmt", session,
"select @@global.innodb_lock_wait_timeout", nil)
require.NoError(t, err)
require.Equal(t, `[[UINT64(20)]]`, fmt.Sprintf("%v", qr.Rows))

_, err = executor.Execute(context.Background(), nil, "TestSetStmt", session,
"set @@global.innodb_lock_wait_timeout = 120", nil)
require.NoError(t, err)
require.Empty(t, session.SystemVariables["innodb_lock_wait_timeout"])

_, err = executor.Execute(context.Background(), nil, "TestSetStmt", session,
"set @@innodb_lock_wait_timeout = 40", nil)
require.NoError(t, err)
require.EqualValues(t, "40", session.SystemVariables["innodb_lock_wait_timeout"])

qr, err = executor.Execute(context.Background(), nil, "TestSetStmt", session,
"select @@innodb_lock_wait_timeout", nil)
require.NoError(t, err)
require.Equal(t, `[[INT64(40)]]`, fmt.Sprintf("%v", qr.Rows))

qr, err = executor.Execute(context.Background(), nil, "TestSetStmt", session,
"select @@global.innodb_lock_wait_timeout", nil)
require.NoError(t, err)
require.Equal(t, `[[UINT64(20)]]`, fmt.Sprintf("%v", qr.Rows))
}
7 changes: 7 additions & 0 deletions go/vt/vtgate/executor_set_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,13 @@ func TestExecutorSetOp(t *testing.T) {
in: "set tx_isolation = 'read-committed'",
sysVars: map[string]string{"tx_isolation": "'read-committed'"},
result: returnResult("tx_isolation", "varchar", "read-committed"),
}, {
in: "set @@innodb_lock_wait_timeout=120",
sysVars: map[string]string{"innodb_lock_wait_timeout": "120"},
result: returnResult("innodb_lock_wait_timeout", "int64", "120"),
}, {
in: "set @@global.innodb_lock_wait_timeout=120",
result: returnResult("innodb_lock_wait_timeout", "int64", "120"),
}}
for _, tcase := range testcases {
t.Run(tcase.in, func(t *testing.T) {
Expand Down
Loading