From 23ad71c3aabd9550ba3b9f5f71b7e47005849999 Mon Sep 17 00:00:00 2001 From: Harshit Gangal Date: Fri, 8 May 2020 00:47:40 +0530 Subject: [PATCH] make setsysvar map Signed-off-by: Harshit Gangal --- go/test/endtoend/vtgate/setstatement/sysvar_test.go | 3 +++ go/vt/vtgate/safe_session.go | 3 +++ 2 files changed, 6 insertions(+) diff --git a/go/test/endtoend/vtgate/setstatement/sysvar_test.go b/go/test/endtoend/vtgate/setstatement/sysvar_test.go index 11c48400067..68703f093b6 100644 --- 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 index b1b5bb70364..1bba7857239 100644 --- 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 }