Skip to content

Commit 6fccbf3

Browse files
authored
Merge pull request #2436 from dolthub/fulghum/com_binlog_prototype
Making `@@server_id` default value match MySQL
2 parents be65239 + 494d7e6 commit 6fccbf3

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

enginetest/queries/variable_queries.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ var VariableQueries = []ScriptTest{
111111
Assertions: []ScriptTestAssertion{
112112
{
113113
Query: "select @@server_id;",
114-
Expected: []sql.Row{{uint32(0)}},
114+
Expected: []sql.Row{{uint32(1)}},
115115
},
116116
{
117117
Query: "set @@server_id=123;",

sql/variables/system_variables.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2132,7 +2132,7 @@ var systemVars = map[string]sql.SystemVariable{
21322132
Dynamic: true,
21332133
SetVarHintApplies: false,
21342134
Type: types.Uint32,
2135-
Default: uint32(0),
2135+
Default: uint32(1),
21362136
},
21372137
"server_uuid": &sql.MysqlSystemVariable{
21382138
Name: "server_uuid",

0 commit comments

Comments
 (0)