Merge pull request #6163 from planetscale/fix-sysvarset

make setsysvar map for first time
vitessio · May 8, 2020 · 4209ae3 · 4209ae3
2 parents 7c01c40 + 23ad71c
commit 4209ae3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/go/test/endtoend/vtgate/setstatement/sysvar_test.go b/go/test/endtoend/vtgate/setstatement/sysvar_test.go
@@ -56,6 +56,9 @@ func TestSetSysVar(t *testing.T) {
 	}, {
 		query:           `set @@sql_mode = concat(@@sql_mode,"ALLOW_INVALID_DATES")`,
 		expectedWarning: "[[VARCHAR(\"Warning\") UINT16(1235) VARCHAR(\"Modification not allowed using set construct for: sql_mode\")]]",
+	}, {
+		query:        `set @@SQL_SAFE_UPDATES = 1`,
+		expectedRows: ``, rowsAffected: 0,
 	}}
 
 	conn, err := mysql.Connect(ctx, &vtParams)

diff --git a/go/vt/vtgate/safe_session.go b/go/vt/vtgate/safe_session.go
@@ -259,5 +259,8 @@ func (session *SafeSession) SetTargetString(target string) {
 func (session *SafeSession) SetSystemVariable(name string, expr string) {
 	session.mu.Lock()
 	defer session.mu.Unlock()
+	if session.SystemVariables == nil {
+		session.SystemVariables = make(map[string]string)
+	}
 	session.SystemVariables[name] = expr
 }